@react-native-ohos/react-native-qr-decode-image-camera 1.1.4-rc.2 → 1.1.5-rc.1

package/README.md

@@ -1,6 +1,6 @@
 # @react-native-ohos/react-native-qr-decode-image-camera
 
-This project is based on [react-native-qr-decode-image-camera@1.1.3](https://github.com/deepanrajkumar/react-native-qr-decode-image-camera)
+This project is based on [react-native-qr-decode-image-camera](https://github.com/deepanrajkumar/react-native-qr-decode-image-camera)@1.1.3
 
 ## Documentation URL
 

package/harmony/qr_decode_image_camera/BuildProfile.ets

@@ -1,7 +1,7 @@
 /**
  * Use these variables when you tailor your ArkTS code. They must be of the const type.
  */
-export const HAR_VERSION = '1.1.4-rc.1';
+export const HAR_VERSION = '1.0.0-0.0.3';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

package/harmony/qr_decode_image_camera/Index.ets

@@ -3,6 +3,7 @@
  * Use of this source code is governed by a MIT license that can be
  * found in the LICENSE file.
  */
- 
+import {RNQrDecodeImageCameraPackage as QrDecodeImageCameraPackage } from './src/main/ets/RNQrDecodeImageCameraPackage';
 export * from "./ts";
-export * from "./src/main/ets/NativeScan"
+export * from "./src/main/ets/NativeScan"
+export default QrDecodeImageCameraPackage;

package/harmony/qr_decode_image_camera/oh-package.json5

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-qr-decode-image-camera",
-  "version": "1.1.4-rc.1",
+  "version": "1.1.5-rc.1",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "author": "",

package/harmony/qr_decode_image_camera/src/main/cpp/CMakeLists.txt

@@ -1,3 +1,4 @@
+# the minimum version of CMake
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
@@ -5,5 +6,5 @@ set(rnoh_qr_decode_image_camera_generated_dir "${CMAKE_CURRENT_SOURCE_DIR}/gener
 file(GLOB_RECURSE rnoh_qr_decode_image_camera_generated_SRC "${rnoh_qr_decode_image_camera_generated_dir}/**/*.cpp")
 file(GLOB rnoh_qr_decode_image_camera_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(rnoh_qr_decode_image_camera SHARED ${rnoh_qr_decode_image_camera_SRC} ${rnoh_qr_decode_image_camera_generated_SRC})
-target_include_directories(rnoh_qr_decode_image_camera PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${rnoh_qr_decode_image_camera_generated_dir} ${CMAKE_CURRENT_SOURCE_DIR}/generated/RNOH/generated)
-target_link_libraries(rnoh_qr_decode_image_camera PUBLIC rnoh)
+target_include_directories(rnoh_qr_decode_image_camera PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${rnoh_qr_decode_image_camera_generated_dir})
+target_link_libraries( rnoh_qr_decode_image_camera PUBLIC rnoh)

package/harmony/qr_decode_image_camera/src/main/cpp/QrDecodeImageCameraPackage.h

@@ -1,19 +1,25 @@
-// 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.
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the MIT 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
+ *
+ *     https://gitee.com/openharmony-sig/rntpc_react-native-qr-decode-image-camera
+ *
+ * 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.
+ */
 
-#ifndef QRDECODEIMAGECAMERAPACKAGE_H
-#define QRDECODEIMAGECAMERAPACKAGE_H
-
-
-#include "generated/RNOH/generated/BaseReactNativeQrDecodeImageCameraPackage.h"
 #pragma once
 
+#include "generated/RNOH/generated/BaseReactNativeQrDecodeImageCameraPackage.h"
 
 namespace rnoh {
 class QrDecodeImageCameraPackage : public BaseReactNativeQrDecodeImageCameraPackage {
     using Super = BaseReactNativeQrDecodeImageCameraPackage;
     using Super::Super;
 };
-} // namespace rnoh
-#endif //QRDECODEIMAGECAMERAPACKAGE_H
+} // namespace rnoh

package/harmony/qr_decode_image_camera/src/main/cpp/generated/RNOH/generated/BaseReactNativeQrDecodeImageCameraPackage.h

@@ -4,9 +4,11 @@
 
 #pragma once
 
+#include <react/renderer/components/react_native_qr_decode_image_camera/ComponentDescriptors.h>
 #include "RNOH/Package.h"
 #include "RNOH/ArkTSTurboModule.h"
 #include "RNOH/generated/turbo_modules/QrDecodeImageCameraNativeModule.h"
+#include "RNOH/generated/components/NativeScanJSIBinder.h"
 
 namespace rnoh {
 
@@ -24,20 +26,14 @@ class BaseReactNativeQrDecodeImageCameraPackageEventEmitRequestHandler : public
   public:
     void handleEvent(Context const &ctx) override {
         auto eventEmitter = ctx.shadowViewRegistry->getEventEmitter<facebook::react::EventEmitter>(ctx.tag);
-        auto componentName = ctx.shadowViewRegistry->getComponentName(ctx.tag);
-
         if (eventEmitter == nullptr) {
             return;
         }
 
-        std::vector<std::string> supportedComponentNames = {
-        };
-
         std::vector<std::string> supportedEventNames = {
+            "read",
         };
-
-        if (std::find(supportedComponentNames.begin(), supportedComponentNames.end(), componentName) != supportedComponentNames.end() &&
-            std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
+        if (std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
             eventEmitter->dispatchEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload));
         }    
     }
@@ -54,11 +50,13 @@ class BaseReactNativeQrDecodeImageCameraPackage : public Package {
 
     std::vector<facebook::react::ComponentDescriptorProvider> createComponentDescriptorProviders() override {
         return {
+            facebook::react::concreteComponentDescriptorProvider<facebook::react::NativeScanComponentDescriptor>(),
         };
     }
 
     ComponentJSIBinderByString createComponentJSIBinderByName() override {
         return {
+            {"NativeScan", std::make_shared<NativeScanJSIBinder>()},
         };
     };
 

package/harmony/qr_decode_image_camera/src/main/cpp/generated/RNOH/generated/components/NativeScanJSIBinder.h

@@ -0,0 +1,30 @@
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+#pragma once
+#include "RNOHCorePackage/ComponentBinders/ViewComponentJSIBinder.h"
+
+namespace rnoh {
+class NativeScanJSIBinder : public ViewComponentJSIBinder {
+  protected:
+    facebook::jsi::Object createNativeProps(facebook::jsi::Runtime &rt) override {
+        auto object = ViewComponentJSIBinder::createNativeProps(rt);
+        object.setProperty(rt, "text", true);
+        object.setProperty(rt, "flashMode", true);
+        object.setProperty(rt, "zoom", true);
+        return object;
+    }
+
+    facebook::jsi::Object createBubblingEventTypes(facebook::jsi::Runtime &rt) override {
+        facebook::jsi::Object events(rt);
+        events.setProperty(rt, "topRead", createBubblingCapturedEvent(rt, "onRead"));
+        return events;
+    }
+
+    facebook::jsi::Object createDirectEventTypes(facebook::jsi::Runtime &rt) override {
+        facebook::jsi::Object events(rt);
+        return events;
+    }
+};
+} // namespace rnoh

package/harmony/qr_decode_image_camera/src/main/cpp/generated/react/renderer/components/react_native_qr_decode_image_camera/ComponentDescriptors.h

@@ -10,15 +10,13 @@
 
 #pragma once
 
-#include "ShadowNodes.h"
+#include <react/renderer/components/react_native_qr_decode_image_camera/ShadowNodes.h>
 #include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
+using NativeScanComponentDescriptor = ConcreteComponentDescriptor<NativeScanShadowNode>;
 
-
-void react_native_qr_decode_image_camera_registerComponentDescriptorsFromCodegen(
-  std::shared_ptr<const ComponentDescriptorProviderRegistry> registry);
-
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/harmony/qr_decode_image_camera/src/main/cpp/generated/react/renderer/components/react_native_qr_decode_image_camera/EventEmitters.cpp

@@ -8,9 +8,19 @@
  * @generated by codegen project: GenerateEventEmitterCpp.js
  */
 
-#include "EventEmitters.h"
+#include <react/renderer/components/react_native_qr_decode_image_camera/EventEmitters.h>
 
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
-} // namespace facebook::react
+void NativeScanEventEmitter::onRead(OnRead $event) const {
+  dispatchEvent("read", [$event=std::move($event)](jsi::Runtime &runtime) {
+    auto $payload = jsi::Object(runtime);
+    $payload.setProperty(runtime, "result", $event.result);
+    return $payload;
+  });
+}
+
+} // namespace react
+} // namespace facebook

package/harmony/qr_decode_image_camera/src/main/cpp/generated/react/renderer/components/react_native_qr_decode_image_camera/EventEmitters.h

@@ -12,6 +12,16 @@
 #include <react/renderer/components/view/ViewEventEmitter.h>
 
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
+class NativeScanEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
 
-} // namespace facebook::react
+  struct OnRead {
+      std::string result;
+    };
+  void onRead(OnRead value) const;
+};
+} // namespace react
+} // namespace facebook

package/harmony/qr_decode_image_camera/src/main/cpp/generated/react/renderer/components/react_native_qr_decode_image_camera/Props.cpp

@@ -8,12 +8,22 @@
  * @generated by codegen project: GeneratePropsCpp.js
  */
 
-#include "Props.h"
+#include <react/renderer/components/react_native_qr_decode_image_camera/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
+NativeScanProps::NativeScanProps(
+    const PropsParserContext &context,
+    const NativeScanProps &sourceProps,
+    const RawProps &rawProps): ViewProps(context, sourceProps, rawProps),
 
+    text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
+    flashMode(convertRawProp(context, rawProps, "flashMode", sourceProps.flashMode, {false})),
+    zoom(convertRawProp(context, rawProps, "zoom", sourceProps.zoom, {0.0}))
+      {}
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/harmony/qr_decode_image_camera/src/main/cpp/generated/react/renderer/components/react_native_qr_decode_image_camera/Props.h

@@ -9,10 +9,23 @@
  */
 #pragma once
 
+#include <react/renderer/components/view/ViewProps.h>
+#include <react/renderer/core/PropsParserContext.h>
 
+namespace facebook {
+namespace react {
 
-namespace facebook::react {
+class NativeScanProps final : public ViewProps {
+ public:
+  NativeScanProps() = default;
+  NativeScanProps(const PropsParserContext& context, const NativeScanProps &sourceProps, const RawProps &rawProps);
 
+#pragma mark - Props
 
+  std::string text{};
+  bool flashMode{false};
+  Float zoom{0.0};
+};
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/harmony/qr_decode_image_camera/src/main/cpp/generated/react/renderer/components/react_native_qr_decode_image_camera/ShadowNodes.cpp

@@ -8,10 +8,12 @@
  * @generated by codegen project: GenerateShadowNodeCpp.js
  */
 
-#include "ShadowNodes.h"
+#include <react/renderer/components/react_native_qr_decode_image_camera/ShadowNodes.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
+extern const char NativeScanComponentName[] = "NativeScan";
 
-
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/harmony/qr_decode_image_camera/src/main/cpp/generated/react/renderer/components/react_native_qr_decode_image_camera/ShadowNodes.h

@@ -10,14 +10,25 @@
 
 #pragma once
 
-#include "EventEmitters.h"
-#include "Props.h"
-#include "States.h"
+#include <react/renderer/components/react_native_qr_decode_image_camera/EventEmitters.h>
+#include <react/renderer/components/react_native_qr_decode_image_camera/Props.h>
+#include <react/renderer/components/react_native_qr_decode_image_camera/States.h>
 #include <react/renderer/components/view/ConcreteViewShadowNode.h>
 #include <jsi/jsi.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
+JSI_EXPORT extern const char NativeScanComponentName[];
 
+/*
+ * `ShadowNode` for <NativeScan> component.
+ */
+using NativeScanShadowNode = ConcreteViewShadowNode<
+    NativeScanComponentName,
+    NativeScanProps,
+    NativeScanEventEmitter,
+    NativeScanState>;
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/harmony/qr_decode_image_camera/src/main/cpp/generated/react/renderer/components/react_native_qr_decode_image_camera/States.cpp

@@ -7,10 +7,12 @@
  *
  * @generated by codegen project: GenerateStateCpp.js
  */
-#include "States.h"
+#include <react/renderer/components/react_native_qr_decode_image_camera/States.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/harmony/qr_decode_image_camera/src/main/cpp/generated/react/renderer/components/react_native_qr_decode_image_camera/States.h

@@ -10,10 +10,27 @@
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
+class NativeScanState {
+public:
+  NativeScanState() = default;
 
+#ifdef ANDROID
+  NativeScanState(NativeScanState const &previousState, folly::dynamic data){};
+  folly::dynamic getDynamic() const {
+    return {};
+  };
+  MapBuffer getMapBuffer() const {
+    return MapBufferBuilder::EMPTY();
+  };
+#endif
+};
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook

package/harmony/qr_decode_image_camera/src/main/ets/NativeScan.ets

@@ -20,7 +20,7 @@ interface NativeScanProps extends ViewBaseProps {
 export type  NativeScanDescriptor = Descriptor<"NativeScan", NativeScanProps>
   @Component
   export struct NativeScan {
-  public static readonly NAME:String = RNC.NativeScan.NAME
+  public static readonly NAME = RNC.NativeScan.NAME
   public ctx!: RNOHContext
   public tag: number = 0
   @State  @Watch("changeProps") descriptor: NativeScanDescriptor = {} as NativeScanDescriptor //监听闪光灯

package/harmony/qr_decode_image_camera/src/main/ets/{RNQrDecodeImageCameraPackage.ts → RNQrDecodeImageCameraPackage.ets}

@@ -6,6 +6,7 @@
 
 import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
 import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
+import { RNOHPackage } from '@rnoh/react-native-openharmony'
 import { TM } from './generated/ts'
 import { RNQrDecodeImageCameraTurboModule } from './RNQrDecodeImageCameraTurboModule';
 
@@ -22,7 +23,7 @@ class RNQrDecodeImageCameraTurboModuleFactory extends TurboModulesFactory {
   }
 }
 
-export class RNQrDecodeImageCameraPackage extends RNPackage {
+export class RNQrDecodeImageCameraPackage extends RNOHPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new RNQrDecodeImageCameraTurboModuleFactory(ctx);
   }

package/harmony/qr_decode_image_camera/src/main/ets/generated/components/NativeScan.ts

@@ -1,10 +1,5 @@
 /**
- * This code was generated by "react-native codegen-harmony"
- * 
- * Do not edit this file as changes may cause incorrect behavior and will be
- * lost once the code is regenerated.
- * 
- * @generatorVersion: 1
+ * This code was generated by "react-native codegen-lib-harmony"
  */
 
 import {

package/harmony/qr_decode_image_camera/src/main/ets/generated/components/ts.ts

@@ -1,8 +1,5 @@
 /**
- * This code was generated by "react-native codegen-harmony"
- *
- * Do not edit this file as changes may cause incorrect behavior and will be
- * lost once the code is regenerated.
+ * This code was generated by "react-native codegen-lib-harmony"
  */
 
 export * from "./NativeScan"

package/package.json

@@ -1,16 +1,22 @@
 {
   "name": "@react-native-ohos/react-native-qr-decode-image-camera",
-  "version": "1.1.4-rc.2",
+  "version": "1.1.5-rc.1",
   "description": "Decode react native from gallery and camera",
   "license": "MIT",
   "main": "index.js",
   "nativePackage": true,
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name react-native-qr-decode-image-camera --cpp-output-path ./harmony/qr_decode_image_camera/src/main/cpp/generated --ets-output-path ./harmony/qr_decode_image_camera/src/main/ets/generated --turbo-modules-spec-paths ./src/NativeQrDecodeImageCamera.ts" 
+    "codegen-lib": "react-native codegen-lib-harmony --no-safety-check --npm-package-name react-native-qr-decode-image-camera --cpp-output-path ./harmony/qr_decode_image_camera/src/main/cpp/generated --ets-output-path ./harmony/qr_decode_image_camera/src/main/ets/generated --turbo-modules-spec-paths ./src/NativeQrDecodeImageCamera.ts  --arkts-components-spec-paths ./src"
   },
   "harmony": {
-    "alias":  "react-native-qr-decode-image-camera"
+    "alias":  "react-native-qr-decode-image-camera",
+    "autolinking": {
+      "etsPackageClassName":"QrDecodeImageCameraPackage",
+      "cppPackageClassName":"QrDecodeImageCameraPackage",
+      "cmakeLibraryTargetName": "rnoh_qr_decode_image_camera", 
+      "ohPackageName": "@react-native-ohos/react-native-qr-decode-image-camera"
+    }
   },
   "keywords": [
     "QRCode",
@@ -21,11 +27,9 @@
   ],
   "dependencies": {
     "prop-types": "^15.8.1",
-    "react-native-qr-decode-image-camera":"^1.1.3",
-    "react-native": "0.72.2",
-    "@react-native-oh/react-native-harmony-cli": "npm:@react-native-oh/react-native-harmony-cli@^0.0.27"
+    "react-native-qr-decode-image-camera":"^1.1.3"
   },
-  "homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-qr-decode-image-camera#readme",
+  "homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-qr-decode-image-camera",
   "repository": {
     "type": "git",
     "url": "https://gitcode.com/openharmony-sig/rntpc_react-native-qr-decode-image-camera.git"
@@ -35,5 +39,10 @@
     "react-native": "^0.69.0",
     "react-native-vision-camera":"^4.0.1",
     "react-native-qr-decode-image-camera":"^1.1.3"
-  }
+  },
+  "publishConfig": {
+		"registry": "https://registry.npmjs.org/",
+		"access": "public"
+	},
+  "author": "deepanrajkumar"
 }

package/src/QRScanner.harmony.jsx

@@ -137,6 +137,7 @@ export default class QRScannerHarmony extends Component {
       if (this.props.isRepeatScan) {
         if (this.newValue !== this.oldValue) {
           this.oldValue = this.newValue;
+          this.setState({ isActive: true });
           Vibration.vibrate();
           this.props.onRead(e);
         }
@@ -144,6 +145,7 @@ export default class QRScannerHarmony extends Component {
       } else {
         if (!this.isShowCode) {
           this.isShowCode = true;
+          this.setState({ isActive: false });
           Vibration.vibrate();
           this.props.onRead(e);
         }

package/src/QRScannerView.js

@@ -208,8 +208,7 @@ export default class QRScannerView extends Component {
             style={[
             this.getBorderSize(),
             this.getBorderColor(),
-            this.getBorderWidth(),
-            { overflow: 'hidden' }
+            this.getBorderWidth()
           ]}>
 
             <Animated.View style={[animatedStyle]}>
@@ -322,7 +321,7 @@ export default class QRScannerView extends Component {
     this.state.animatedValue.setValue(0); //重置Rotate动画值为0
     Animated.timing(
       this.state.animatedValue,
-      {toValue: this.props.rectHeight - this.props.scanBarHeight,        
+      {toValue: this.props.rectHeight,
       duration: this.props.scanBarAnimateTime,
       easing: Easing.linear,
       useNativeDriver: true