@react-native-ohos/react-native-keyboard-controller 1.16.6-rc.2 → 1.17.0-beta.2

package/harmony/keyboard_controller/src/main/cpp/ViewHierarchyNavigator.cpp

@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+/**
+ * MIT License
+ *
+ * Copyright (C) 2026 Huawei Device Co., Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "ViewHierarchyNavigator.h"
+#include <glog/logging.h>
+#include <algorithm>
+
+namespace rnoh {
+TextInputComponentInstance::Shared ViewHierarchyNavigator::setFocusTo(
+    const std::string& direction, ComponentInstance::Shared currentFocus) {
+    if (!currentFocus) {
+        DLOG(INFO) << "ViewHierarchyNavigator::setFocusTo - currentFocus is null";
+        return nullptr;
+    }
+    DLOG(INFO) << "ViewHierarchyNavigator::setFocusTo direction=" << direction
+        << " currentFocus->getTag(): " << currentFocus->getTag();
+    auto textInput = findTextInputInDirection(currentFocus, direction);
+    if (textInput) {
+        DLOG(INFO) << "ViewHierarchyNavigator::setFocusTo - found target input";
+    } else {
+        DLOG(INFO) << "ViewHierarchyNavigator::setFocusTo - no target input found";
+    }
+    return textInput;
+}
+
+std::vector<TextInputComponentInstance::Shared> ViewHierarchyNavigator::getAllInputFields(
+    ComponentInstance::Shared rootComponent) {
+    std::vector<TextInputComponentInstance::Shared> textInputs;
+    if (!rootComponent) {
+        return textInputs;
+    }
+    // 递归查找所有输入框
+    std::function<void(ComponentInstance::Shared)> findTextInputs = 
+        [&textInputs, &findTextInputs](ComponentInstance::Shared component) {
+            if (!component) return;
+            auto textInput = isValidTextInput(component);
+            if (textInput) {
+                textInputs.push_back(textInput);
+            } else {
+                // 递归查找子组件
+                const auto& children = component->getChildren();
+                for (const auto& child : children) {
+                    findTextInputs(child);
+                }
+            }
+        };
+    findTextInputs(rootComponent);
+    return textInputs;
+}
+
+TextInputComponentInstance::Shared ViewHierarchyNavigator::findTextInputInDirection(
+    ComponentInstance::Shared currentFocus, const std::string& direction) {
+    if (!currentFocus) {
+        return nullptr;
+    }
+    DLOG(INFO) << "jjtest currentFocus.name" << currentFocus->getComponentName();
+    // 获取父组件
+    auto parentComponent = currentFocus->getParent().lock();
+    if (!parentComponent) {
+        DLOG(INFO) << "jjtest ViewHierarchyNavigator - no parent found";
+        return nullptr;
+    }
+    // 获取父组件的所有子组件
+    const auto& siblings = parentComponent->getChildren();
+    // 找到当前组件在父组件中的索引
+    int currentIndex = -1;
+    for (size_t i = 0; i < siblings.size(); ++i) {
+        if (siblings[i].get() == currentFocus.get()) {
+            currentIndex = static_cast<int>(i);
+            break;
+        }
+    }
+    if (currentIndex == -1) {
+        DLOG(INFO) << "ViewHierarchyNavigator - current focus not found in parent's children";
+        return nullptr;
+    }
+    DLOG(INFO) << "ViewHierarchyNavigator - currentIndex=" << currentIndex
+        << " siblings.size()=" << siblings.size();
+    // 根据方向确定遍历范围
+    if (direction == "next") {
+        // 向后遍历：从 currentIndex+1 到末尾
+        for (size_t i = currentIndex + 1; i < siblings.size(); ++i) {
+            auto result = findTextInputOrGoDeeper(siblings[i], direction);
+            if (result) {
+                return result;
+            }
+        }
+    } else {
+        // 向前遍历：从 currentIndex-1 到 0（倒序）
+        for (int i = currentIndex - 1; i >= 0; --i) {
+            auto result = findTextInputOrGoDeeper(siblings[i], direction);
+            if (result) {
+                return result;
+            }
+        }
+    }
+    // 如果同级没找到，递归到父级继续查找
+    DLOG(INFO) << "ViewHierarchyNavigator - searching in parent's parent";
+    return findTextInputInDirection(parentComponent, direction);
+}
+
+TextInputComponentInstance::Shared ViewHierarchyNavigator::findTextInputInHierarchy(
+    ComponentInstance::Shared component, const std::string& direction) {
+    if (!component) {
+        return nullptr;
+    }
+    const auto& children = component->getChildren();
+    if (direction == "next") {
+        // 正序遍历
+        for (const auto& child : children) {
+            auto result = findTextInputOrGoDeeper(child, direction);
+            if (result) {
+                return result;
+            }
+        }
+    } else {
+        // 倒序遍历
+        for (auto it = children.rbegin(); it != children.rend(); ++it) {
+            auto result = findTextInputOrGoDeeper(*it, direction);
+            if (result) {
+                return result;
+            }
+        }
+    }
+    return nullptr;
+}
+
+TextInputComponentInstance::Shared ViewHierarchyNavigator::findTextInputOrGoDeeper(
+    ComponentInstance::Shared child, const std::string& direction) {
+    if (!child) {
+        return nullptr;
+    }
+    // 首先检查当前组件是否是有效输入框
+    auto textInput = isValidTextInput(child);
+    if (textInput) {
+        return textInput;
+    }
+    // 如果不是输入框，递归查找其子组件
+    return findTextInputInHierarchy(child, direction);
+}
+
+TextInputComponentInstance::Shared ViewHierarchyNavigator::isValidTextInput(
+    ComponentInstance::Shared component) {
+    if (!component) {
+        return nullptr;
+    }
+    // 检查组件名称是否包含 TextInput 或 TextArea
+    const std::string& name = component->getComponentName();
+    if (name.find("TextInput") != std::string::npos || 
+        name.find("TextArea") != std::string::npos) {
+        // 尝试转换为 TextInputComponentInstance
+        auto textInput = std::dynamic_pointer_cast<TextInputComponentInstance>(component);
+        if (textInput) {
+            // TODO: 可以在这里添加 enabled 状态检查
+            // 类似于 iOS 的 textField.isEnabled 或 textView.isEditable
+            DLOG(INFO) << "ViewHierarchyNavigator - found valid TextInput: " << name;
+            return textInput;
+        }
+    }
+    return nullptr;
+}
+} // namespace rnoh

package/harmony/keyboard_controller/src/main/cpp/ViewHierarchyNavigator.h

@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+/**
+ * MIT License
+ *
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef VIEW_HIERARCHY_NAVIGATOR_H
+#define VIEW_HIERARCHY_NAVIGATOR_H
+
+#include <string>
+#include <vector>
+#include <memory>
+#include "RNOH/ComponentInstance.h"
+#include "RNOHCorePackage/ComponentInstances/TextInputComponentInstance.h"
+
+namespace rnoh {
+
+/**
+ * ViewHierarchyNavigator - 视图层级导航器
+ * 
+ * 通过遍历组件树来查找下一个/上一个输入框，
+ * 实现逻辑与 iOS 版本保持一致。
+ */
+class ViewHierarchyNavigator {
+public:
+    /**
+     * 设置焦点到指定方向的输入框
+     * @param direction 方向 "next" | "prev"
+     * @param currentFocus 当前焦点的组件实例
+     * @return 找到的目标输入框，如果没有则返回nullptr
+     */
+    static TextInputComponentInstance::Shared setFocusTo(
+        const std::string& direction,
+        ComponentInstance::Shared currentFocus
+    );
+
+    /**
+     * 获取指定组件树下的所有输入框
+     * @param rootComponent 根组件
+     * @return 所有输入框的列表
+     */
+    static std::vector<TextInputComponentInstance::Shared> getAllInputFields(
+        ComponentInstance::Shared rootComponent
+    );
+
+private:
+    /**
+     * 根据方向查找输入框
+     * @param currentFocus 当前焦点组件
+     * @param direction "next" 或 "prev"
+     * @return 找到的输入框，如果没有则返回nullptr
+     */
+    static TextInputComponentInstance::Shared findTextInputInDirection(
+        ComponentInstance::Shared currentFocus,
+        const std::string& direction
+    );
+
+    /**
+     * 在视图层级中查找输入框（递归向下）
+     * @param component 要搜索的组件
+     * @param direction 方向，影响遍历顺序
+     * @return 找到的输入框，如果没有则返回nullptr
+     */
+    static TextInputComponentInstance::Shared findTextInputInHierarchy(
+        ComponentInstance::Shared component,
+        const std::string& direction
+    );
+
+    /**
+     * 查找输入框或递归深入
+     * @param child 子组件
+     * @param direction 方向
+     * @return 找到的输入框，如果没有则返回nullptr
+     */
+    static TextInputComponentInstance::Shared findTextInputOrGoDeeper(
+        ComponentInstance::Shared child,
+        const std::string& direction
+    );
+
+    /**
+     * 检查组件是否是有效的输入框
+     * @param component 要检查的组件
+     * @return 如果是有效输入框则返回转换后的指针，否则返回nullptr
+     */
+    static TextInputComponentInstance::Shared isValidTextInput(
+        ComponentInstance::Shared component
+    );
+};
+
+} // namespace rnoh
+#endif // VIEW_HIERARCHY_NAVIGATOR_H

package/harmony/keyboard_controller/src/main/cpp/keyboardControllerPackage.cpp

@@ -1,43 +1,64 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
- 
-#include "keyboardControllerPackage.h"
-#include "KeyboardControllerViewJSIBinder.h"
-#include "KeyboardGestureAreaJSIBinder.h"
-
-
-using namespace facebook;
-using namespace rnoh;
-
-std::vector<facebook::react::ComponentDescriptorProvider>
-KeyboardControllerPackage::createComponentDescriptorProviders() {
-    return {facebook::react::concreteComponentDescriptorProvider<
-                facebook::react::KeyboardControllerViewComponentDescriptor>(),
-            facebook::react::concreteComponentDescriptorProvider<
-                facebook::react::KeyboardGestureAreaComponentDescriptor>()};
-}
-ComponentJSIBinderByString KeyboardControllerPackage::createComponentJSIBinderByName() {
-    return {{"RNKeyboardControllerView", std::make_shared<KeyboardControllerViewJSIBinder>()},
-            {"RNKeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()}};
-}
-
-std::unique_ptr<TurboModuleFactoryDelegate> KeyboardControllerPackage::createTurboModuleFactoryDelegate() {
-    return std::make_unique<KeyboardControllerTurboModuleFactoryDelegate>();
-}
-
-ComponentInstanceFactoryDelegate::Shared KeyboardControllerPackage::createComponentInstanceFactoryDelegate() {
-    return std::make_shared<KeyboardControllerComponentInstanceFactoryDelegate>();
-};
-
-ComponentInstance::Shared KeyboardControllerPackage::createComponentInstance(const ComponentInstance::Context &ctx) {
-    if (ctx.componentName == "RNKeyboardControllerView") {
-        return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
-    }
-    if (ctx.componentName == "RNKeyboardGestureArea") {
-        return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
-    }
-    return nullptr;
-};
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+/**
+ * MIT License
+ *
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+ 
+#include "keyboardControllerPackage.h"
+#include "KeyboardControllerViewJSIBinder.h"
+#include "KeyboardGestureAreaJSIBinder.h"
+
+
+using namespace facebook;
+using namespace rnoh;
+
+std::vector<facebook::react::ComponentDescriptorProvider>
+KeyboardControllerPackage::createComponentDescriptorProviders() {
+    return {facebook::react::concreteComponentDescriptorProvider<
+                facebook::react::KeyboardControllerViewComponentDescriptor>(),
+            facebook::react::concreteComponentDescriptorProvider<
+                facebook::react::KeyboardGestureAreaComponentDescriptor>()};
+}
+ComponentJSIBinderByString KeyboardControllerPackage::createComponentJSIBinderByName() {
+    return {{"RNKeyboardControllerView", std::make_shared<KeyboardControllerViewJSIBinder>()},
+            {"RNKeyboardGestureArea", std::make_shared<KeyboardGestureAreaJSIBinder>()}};
+}
+
+std::unique_ptr<TurboModuleFactoryDelegate> KeyboardControllerPackage::createTurboModuleFactoryDelegate() {
+    return std::make_unique<KeyboardControllerTurboModuleFactoryDelegate>();
+}
+
+ComponentInstanceFactoryDelegate::Shared KeyboardControllerPackage::createComponentInstanceFactoryDelegate() {
+    return std::make_shared<KeyboardControllerComponentInstanceFactoryDelegate>();
+};
+
+ComponentInstance::Shared KeyboardControllerPackage::createComponentInstance(const ComponentInstance::Context &ctx) {
+    if (ctx.componentName == "RNKeyboardControllerView") {
+        return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
+    }
+    if (ctx.componentName == "RNKeyboardGestureArea") {
+        return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
+    }
+    return nullptr;
+};

package/harmony/keyboard_controller/src/main/cpp/keyboardControllerPackage.h

@@ -1,56 +1,77 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-#ifndef TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERPACKAGE_H
-#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERPACKAGE_H
-
-#ifndef KEYBOARDCONTROLLERPACKAGE_H
-#define KEYBOARDCONTROLLERPACKAGE_H
-
-#include "KeyboardGestureAreaComponentInstance.h"
-#include "RNOH/Package.h"
-#include "RNKeyboardController.h"
-#include "RNStatusBarManagerCompat.h"
-#include "KeyboardControllerViewComponentInstance.h"
-namespace rnoh {
- class KeyboardControllerComponentInstanceFactoryDelegate : public ComponentInstanceFactoryDelegate {
- public:
-        ComponentInstance::Shared create(ComponentInstance::Context ctx) override {
-            if (ctx.componentName == "RNKeyboardControllerView") {
-                return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
-            }
-         if (ctx.componentName == "RNKeyboardGestureArea") {
-                return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
-            }
-            return nullptr;
-        }
-    };
-class KeyboardControllerTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
-public:
-    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
-        if (name == "KeyboardController") {
-            return std::make_shared<KeyboardController>(ctx, name);
-        }
-          if (name == "StatusBarManagerCompat") {
-            return std::make_shared<StatusBarManagerCompat>(ctx, name);
-        }
-        return nullptr;
-    };
-};
-class KeyboardControllerPackage : public Package{
-public:
-    KeyboardControllerPackage(Package::Context ctx) : Package(ctx) {}
-    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override;
-    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override;
-    ComponentJSIBinderByString createComponentJSIBinderByName() override;
-    ComponentInstance::Shared createComponentInstance(const ComponentInstance::Context &ctx) override;
-    ComponentInstanceFactoryDelegate::Shared createComponentInstanceFactoryDelegate() override;
-};
-} // namespace rnoh
-
-#endif
-
-#endif
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+/**
+ * MIT License
+ *
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERPACKAGE_H
+#define TESTER_HARMONY_KEYBOARD_CONTROLLER_SRC_MAIN_CPP_KEYBOARDCONTROLLERPACKAGE_H
+
+#ifndef KEYBOARDCONTROLLERPACKAGE_H
+#define KEYBOARDCONTROLLERPACKAGE_H
+
+#include "KeyboardGestureAreaComponentInstance.h"
+#include "RNOH/Package.h"
+#include "RNKeyboardController.h"
+#include "RNStatusBarManagerCompat.h"
+#include "KeyboardControllerViewComponentInstance.h"
+namespace rnoh {
+ class KeyboardControllerComponentInstanceFactoryDelegate : public ComponentInstanceFactoryDelegate {
+ public:
+        ComponentInstance::Shared create(ComponentInstance::Context ctx) override {
+            if (ctx.componentName == "RNKeyboardControllerView") {
+                return std::make_shared<KeyboardControllerViewComponentInstance>(ctx);
+            }
+         if (ctx.componentName == "RNKeyboardGestureArea") {
+                return std::make_shared<KeyboardGestureAreaComponentInstance>(ctx);
+            }
+            return nullptr;
+        }
+    };
+class KeyboardControllerTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
+public:
+    SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
+        if (name == "KeyboardController") {
+            return std::make_shared<KeyboardController>(ctx, name);
+        }
+          if (name == "StatusBarManagerCompat") {
+            return std::make_shared<StatusBarManagerCompat>(ctx, name);
+        }
+        return nullptr;
+    };
+};
+class KeyboardControllerPackage : public Package{
+public:
+    KeyboardControllerPackage(Package::Context ctx) : Package(ctx) {}
+    std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override;
+    std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override;
+    ComponentJSIBinderByString createComponentJSIBinderByName() override;
+    ComponentInstance::Shared createComponentInstance(const ComponentInstance::Context &ctx) override;
+    ComponentInstanceFactoryDelegate::Shared createComponentInstanceFactoryDelegate() override;
+};
+} // namespace rnoh
+
+#endif
+
+#endif

package/harmony/keyboard_controller/src/main/ets/Logger.ts

@@ -1,46 +1,67 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-import hilog from '@ohos.hilog';
-
-class Logger {
-  private domain: number;
-  private prefix: string;
-  private format: string = '%{public}s, %{public}s';
-  private isDebug: boolean;
-
-  /**
-   * constructor.
-   *
-   * @param Prefix Identifies the log tag.
-   * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
-   */
-  constructor(prefix: string = 'MyApp', domain: number = 0xFF00, isDebug = false) {
-    this.prefix = prefix;
-    this.domain = domain;
-    this.isDebug = isDebug;
-  }
-
-  debug(...args: string[]): void {
-    if(this.isDebug) {
-      hilog.debug(this.domain, this.prefix, this.format, args);
-    }
-  }
-
-  info(...args: string[]): void {
-    hilog.info(this.domain, this.prefix, this.format, args);
-  }
-
-  warn(...args: string[]): void {
-    hilog.warn(this.domain, this.prefix, this.format, args);
-  }
-
-  error(...args: string[]): void {
-    hilog.error(this.domain, this.prefix, this.format, args);
-  }
-}
-
+/*
+ * Copyright (c) Huawei Technologies Co., Ltd. 2020-2020. All rights reserved.
+ */
+/**
+ * MIT License
+ *
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import hilog from '@ohos.hilog';
+
+class Logger {
+  private domain: number;
+  private prefix: string;
+  private format: string = '%{public}s, %{public}s';
+  private isDebug: boolean;
+
+  /**
+   * constructor.
+   *
+   * @param Prefix Identifies the log tag.
+   * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF.
+   */
+  constructor(prefix: string = 'MyApp', domain: number = 0xFF00, isDebug = false) {
+    this.prefix = prefix;
+    this.domain = domain;
+    this.isDebug = isDebug;
+  }
+
+  debug(...args: string[]): void {
+    if(this.isDebug) {
+      hilog.debug(this.domain, this.prefix, this.format, args);
+    }
+  }
+
+  info(...args: string[]): void {
+    hilog.info(this.domain, this.prefix, this.format, args);
+  }
+
+  warn(...args: string[]): void {
+    hilog.warn(this.domain, this.prefix, this.format, args);
+  }
+
+  error(...args: string[]): void {
+    hilog.error(this.domain, this.prefix, this.format, args);
+  }
+}
+
 export default new Logger('KeyboardController', 0xFF00, false)