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

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+# v1.2.0-rc.3
+
+## 更新内容
+
+* fix :修复在低api系统版本的设备上相机画面不显示的问题
+
+# v1.2.0-rc.2
+
+## 更新内容
+
+* fix:修复依赖库升级后导致相机画面不显示的问题
+
+# v1.2.0-rc.1
+
+## 更新内容
+
+* 修改版本号为1.2.0-rc.1
+
 # v1.1.4-rc.2
 
 ## 更新内容

package/README.md

@@ -4,9 +4,9 @@ This project is based on [react-native-qr-decode-image-camera@1.1.3](https://git
 
 ## Documentation URL
 
-- [中文 ](https://gitee.com/react-native-oh-library/usage-docs/blob/master/zh-cn/react-native-qr-decode-image-camera.md)
+- [中文 ](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/zh-cn/react-native-qr-decode-image-camera.md)
 
-- [英文 ](https://gitee.com/react-native-oh-library/usage-docs/blob/master/en/react-native-qr-decode-image-camera.md)
+- [英文 ](https://gitcode.com/OpenHarmony-RN/usage-docs/blob/master/en/react-native-qr-decode-image-camera.md)
 
 ## License
 

package/harmony/qr_decode_image_camera/BuildProfile.ets

@@ -1,17 +1,17 @@
-/**
- * Use these variables when you tailor your ArkTS code. They must be of the const type.
- */
-export const HAR_VERSION = '1.2.0-rc.1';
-export const BUILD_MODE_NAME = 'debug';
-export const DEBUG = true;
-export const TARGET_NAME = 'default';
-
-/**
- * BuildProfile Class is used only for compatibility purposes.
- */
-export default class BuildProfile { 
-	static readonly HAR_VERSION = HAR_VERSION;
-	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
-	static readonly DEBUG = DEBUG;
-	static readonly TARGET_NAME = TARGET_NAME;
+/**
+ * Use these variables when you tailor your ArkTS code. They must be of the const type.
+ */
+export const HAR_VERSION = '1.2.0';
+export const BUILD_MODE_NAME = 'debug';
+export const DEBUG = true;
+export const TARGET_NAME = 'default';
+
+/**
+ * BuildProfile Class is used only for compatibility purposes.
+ */
+export default class BuildProfile { 
+	static readonly HAR_VERSION = HAR_VERSION;
+	static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
+	static readonly DEBUG = DEBUG;
+	static readonly TARGET_NAME = TARGET_NAME;
 }

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-ohos/react-native-qr-decode-image-camera",
-  "version": "1.2.0-rc.2",
+  "version": "1.2.0",
   "description": "Decode react native from gallery and camera",
   "license": "MIT",
   "main": "index.js",

package/src/Camera.tsx

@@ -9,7 +9,7 @@ import {
   PixelRatio,
   StyleSheet
 } from "react-native";
-import { Camera, useCameraDevice, useCameraPermission } from 'react-native-vision-camera'
+import { Camera, useCameraDevice, useCameraFormat, useCameraPermission, useCodeScanner } from 'react-native-vision-camera'
 export const ComponentCamera = (props) => {
   const CODE_TYPES = [
     'code-128',
@@ -27,34 +27,46 @@ export const ComponentCamera = (props) => {
     'data-matrix'
   ]
   const device = useCameraDevice('back');
+  const format = useCameraFormat(device, [
+    { videoResolution: { width: 3048, height: 2160 } },
+    { fps: 60 },
+  ]);
   const { hasPermission, requestPermission } = useCameraPermission();
 
-  if (!hasPermission) {
-    requestPermission();
-  }
 
-  const codeScanner =   {  
+  const codeScanner = useCodeScanner({  
       codeTypes: CODE_TYPES,
       onCodeScanned: (codes) => {
         // console.log(`Scanned ${codes.length} codes:`, codes)
         const value = codes[0]
         if (value) {
           props.onRead(value)
-        } else {
-          if (value == null) return
         }
       }
-  }  
+    });  
 
+  if (!hasPermission) {
+    requestPermission();
+    return null;
+  }
 
   return (
     <Camera
-      style={StyleSheet.absoluteFill}
+      style={styles.camera}
       isActive={props.isActive}
       preview={true}
       device={device}
       codeScanner={codeScanner}
       torch={props.torch ? "on" : "off"}
+	  resizeMode={'cover'}
+      format={format}
     /> 
   )
-}
+}
+
+const styles = StyleSheet.create({
+  camera: {
+    width: '100%',
+    aspectRatio: 3 / 4,
+  },
+});

package/src/QRScanner.harmony.jsx

@@ -70,6 +70,7 @@ export default class QRScannerHarmony extends Component {
         <View style={[styles.topButtonsContainer, this.props.topViewStyle]}>
           {this.props.renderTopView()}
         </View>
+		<View style={styles.scanOverlayContainer}>
         <QRScannerView
           maskColor={this.props.maskColor}
           cornerColor={this.props.cornerColor}
@@ -95,6 +96,7 @@ export default class QRScannerHarmony extends Component {
           finderY={this.props.finderY}
           returnSize={this.barCodeSize}
         />
+		</View>
         <View
           style={[styles.bottomButtonsContainer, this.props.bottomViewStyle]}
         >
@@ -175,6 +177,13 @@ const styles = StyleSheet.create({
     left: 0,
     right: 0
   },
+  scanOverlayContainer: {
+    position: "absolute",
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
+  },
   authorizationContainer: {
     flex: 1,
     alignItems: "center",