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

package/CHANGELOG.md

@@ -0,0 +1,12 @@
+# v1.1.4-rc.2
+
+## 更新内容
+
+* fix:修复非重复扫描时开启闪光灯识别后闪光灯无法关闭和扫描线会超出扫描框底部的问题
+
+# v1.1.4-rc.1
+
+## 更新内容
+
+* 修改组织名为@react-native-ohos
+* 移除 codegenConfig 依赖，并将代码生成逻辑集成到库内部

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](https://github.com/deepanrajkumar/react-native-qr-decode-image-camera)@1.1.3
+This project is based on [react-native-qr-decode-image-camera@1.1.3](https://github.com/deepanrajkumar/react-native-qr-decode-image-camera)
 
 ## 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.0.0-0.0.3';
+export const HAR_VERSION = '1.2.0-rc.1';
 export const BUILD_MODE_NAME = 'debug';
 export const DEBUG = true;
 export const TARGET_NAME = 'default';

package/harmony/qr_decode_image_camera/Index.ets

@@ -3,7 +3,6 @@
  * 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 default QrDecodeImageCameraPackage;
+export * from "./src/main/ets/NativeScan"

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.5-rc.2",
+  "version": "1.2.0-rc.1",
   "description": "Please describe the basic information.",
   "main": "Index.ets",
   "author": "",

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

@@ -1,4 +1,3 @@
-# the minimum version of CMake
 cmake_minimum_required(VERSION 3.13)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
@@ -6,5 +5,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})
-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} ${CMAKE_CURRENT_SOURCE_DIR}/generated/RNOH/generated)
+target_link_libraries(rnoh_qr_decode_image_camera PUBLIC rnoh)

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

@@ -1,25 +1,19 @@
-/*
- * 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.
- */
+// 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 QRDECODEIMAGECAMERAPACKAGE_H
+#define QRDECODEIMAGECAMERAPACKAGE_H
 
-#pragma once
 
 #include "generated/RNOH/generated/BaseReactNativeQrDecodeImageCameraPackage.h"
+#pragma once
+
 
 namespace rnoh {
 class QrDecodeImageCameraPackage : public BaseReactNativeQrDecodeImageCameraPackage {
     using Super = BaseReactNativeQrDecodeImageCameraPackage;
     using Super::Super;
 };
-} // namespace rnoh
+} // namespace rnoh
+#endif //QRDECODEIMAGECAMERAPACKAGE_H

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

@@ -4,11 +4,9 @@
 
 #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 {
 
@@ -26,14 +24,20 @@ 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(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
+
+        if (std::find(supportedComponentNames.begin(), supportedComponentNames.end(), componentName) != supportedComponentNames.end() &&
+            std::find(supportedEventNames.begin(), supportedEventNames.end(), ctx.eventName) != supportedEventNames.end()) {
             eventEmitter->dispatchEvent(ctx.eventName, ArkJS(ctx.env).getDynamic(ctx.payload));
         }    
     }
@@ -50,13 +54,11 @@ 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/react/renderer/components/react_native_qr_decode_image_camera/ComponentDescriptors.h

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

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

@@ -8,19 +8,9 @@
  * @generated by codegen project: GenerateEventEmitterCpp.js
  */
 
-#include <react/renderer/components/react_native_qr_decode_image_camera/EventEmitters.h>
+#include "EventEmitters.h"
 
 
-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
+} // namespace facebook::react

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

@@ -12,16 +12,6 @@
 #include <react/renderer/components/view/ViewEventEmitter.h>
 
 
-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
+} // namespace facebook::react

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

@@ -8,22 +8,12 @@
  * @generated by codegen project: GeneratePropsCpp.js
  */
 
-#include <react/renderer/components/react_native_qr_decode_image_camera/Props.h>
+#include "Props.h"
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/propsConversions.h>
 
-namespace facebook {
-namespace react {
+namespace facebook::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 react
-} // namespace facebook
+} // namespace facebook::react

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

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

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

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

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

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

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

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

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

@@ -10,27 +10,10 @@
 
 #ifdef ANDROID
 #include <folly/dynamic.h>
-#include <react/renderer/mapbuffer/MapBuffer.h>
-#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #endif
 
-namespace facebook {
-namespace react {
+namespace facebook::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 react
-} // namespace facebook
+} // namespace facebook::react

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 = RNC.NativeScan.NAME
+  public static readonly NAME:String = 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.ets → RNQrDecodeImageCameraPackage.ts}

@@ -6,7 +6,6 @@
 
 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';
 
@@ -23,7 +22,7 @@ class RNQrDecodeImageCameraTurboModuleFactory extends TurboModulesFactory {
   }
 }
 
-export class RNQrDecodeImageCameraPackage extends RNOHPackage {
+export class RNQrDecodeImageCameraPackage extends RNPackage {
   createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
     return new RNQrDecodeImageCameraTurboModuleFactory(ctx);
   }

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

@@ -1,5 +1,10 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * 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
  */
 
 import {

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

@@ -1,5 +1,8 @@
 /**
- * This code was generated by "react-native codegen-lib-harmony"
+ * 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.
  */
 
 export * from "./NativeScan"

package/package.json

@@ -1,22 +1,16 @@
 {
   "name": "@react-native-ohos/react-native-qr-decode-image-camera",
-  "version": "1.1.5-rc.2",
+  "version": "1.2.0-rc.2",
   "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  --arkts-components-spec-paths ./src"
+    "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" 
   },
   "harmony": {
-    "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"
-    }
+    "alias":  "react-native-qr-decode-image-camera"
   },
   "keywords": [
     "QRCode",
@@ -27,9 +21,11 @@
   ],
   "dependencies": {
     "prop-types": "^15.8.1",
-    "react-native-qr-decode-image-camera":"^1.1.3"
+    "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"
   },
-  "homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-qr-decode-image-camera",
+  "homepage": "https://gitcode.com/openharmony-sig/rntpc_react-native-qr-decode-image-camera#readme",
   "repository": {
     "type": "git",
     "url": "https://gitcode.com/openharmony-sig/rntpc_react-native-qr-decode-image-camera.git"
@@ -39,10 +35,5 @@
     "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/Camera.tsx

@@ -6,7 +6,8 @@
 
 import React, { useState, useEffect } from 'react';
 import {
-  PixelRatio
+  PixelRatio,
+  StyleSheet
 } from "react-native";
 import { Camera, useCameraDevice, useCameraPermission } from 'react-native-vision-camera'
 export const ComponentCamera = (props) => {
@@ -48,6 +49,7 @@ export const ComponentCamera = (props) => {
 
   return (
     <Camera
+      style={StyleSheet.absoluteFill}
       isActive={props.isActive}
       preview={true}
       device={device}

package/src/QRScanner.harmony.jsx

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

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

@@ -1,30 +0,0 @@
-/**
- * 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