@aks-dev/easyui 1.2.30 → 1.2.31

package/android/src/main/AndroidManifest.xml

@@ -50,5 +50,11 @@
                 android:resource="@xml/file_paths" />
         </provider>
     </application>
+
+
+    <uses-permission android:name="android.permission.CAMERA" />
+    <!-- optionally, if you want to record audio: -->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>
   

package/dist/components/Hud/Scanner/Scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Scanner.d.ts","sourceRoot":"","sources":["../../../../src/components/Hud/Scanner/Scanner.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAwC,MAAM,OAAO,CAAC;AA6B7D,KAAK,QAAQ,GAAG,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAEpC,KAAK,aAAa,GAAG;IACnB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,WAAW,EAAE,MAAM,IAAI,CAAC;CACzB,CAAC;AAQF,eAAO,MAAM,OAAO,qEAoMlB,CAAC;AAsHH,eAAO,MAAM,UAAU,uCAAmC,CAAC;AAC3D,eAAO,MAAM,WAAW,GAAI,IAAI,QAAQ,qBACH,CAAC;AACtC,eAAO,MAAM,WAAW,wBAA0C,CAAC"}
+{"version":3,"file":"Scanner.d.ts","sourceRoot":"","sources":["../../../../src/components/Hud/Scanner/Scanner.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAwC,MAAM,OAAO,CAAC;AA4B7D,KAAK,QAAQ,GAAG,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;AAEpC,KAAK,aAAa,GAAG;IACnB,WAAW,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,IAAI,CAAC;IACpC,WAAW,EAAE,MAAM,IAAI,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,OAAO,qEA+MlB,CAAC;AAwHH,eAAO,MAAM,UAAU,uCAAmC,CAAC;AAC3D,eAAO,MAAM,WAAW,GAAI,IAAI,QAAQ,qBACH,CAAC;AACtC,eAAO,MAAM,WAAW,wBAA0C,CAAC"}

package/dist/components/Hud/Scanner/Scanner.js

@@ -8,25 +8,25 @@
 import React, { useImperativeHandle, useState } from "react";
 import { Animated, BackHandler, Easing, Image, StyleSheet, Text, TouchableOpacity, View, } from "react-native";
 import { Camera, useCameraDevice, useCameraPermission, useCodeScanner, } from "react-native-vision-camera";
-import { PERMISSIONS, requestMultiple } from "react-native-permissions";
 import { navigationBarHeight, px2dp, statusBarHeight, } from "../../../screen/px2dp";
 import { px2sp } from "../../../screen/px2sp";
 import * as utils from "../../../utils/lazy";
 import { showToast } from "../Toast/Toast";
-// enum SCANNER_TYPE {
-//     DENIED = -1,//没有开始权限
-//     START = 0,//没有扫描结果，继续扫描
-//     SUCCESS = 1,//已有扫描结果，停止扫描
-// }
 export const Scanner = React.forwardRef((_, ref) => {
     const [show, setShow] = useState(false);
     const moveAnim = React.useRef(new Animated.Value(0)).current;
     const [pointStyle, setPointStyle] = React.useState();
-    const cameraRef = React.useRef(null);
     const _cbRef = React.useRef(null);
     const _scanerResultRef = React.useRef(null);
-    const device = useCameraDevice("back");
-    const { hasPermission } = useCameraPermission();
+    const device = useCameraDevice("back", {
+        physicalDevices: [
+            "ultra-wide-angle-camera",
+            "wide-angle-camera",
+            "telephoto-camera",
+        ],
+    });
+    const { hasPermission, requestPermission } = useCameraPermission();
+    const [torchOn, setTorchOn] = React.useState(false);
     React.useEffect(() => {
         const onBackPress = () => {
             if (show) {
@@ -42,12 +42,8 @@ export const Scanner = React.forwardRef((_, ref) => {
         hideScanner: _hideScanner,
     }), [show]);
     const _showScanner = async (cb) => {
-        let res = await requestMultiple([
-            PERMISSIONS.IOS.CAMERA,
-            PERMISSIONS.ANDROID.CAMERA,
-        ]);
-        if (res[PERMISSIONS.ANDROID.CAMERA] == "granted" ||
-            res[PERMISSIONS.IOS.CAMERA] == "granted") {
+        const cameraGranted = await requestPermission();
+        if (cameraGranted) {
             _scanerResultRef.current = null;
             setShow(true);
             setPointStyle({});
@@ -80,7 +76,6 @@ export const Scanner = React.forwardRef((_, ref) => {
         }),
     ]));
     const animationStart = async () => {
-        cameraRef.current?.resumePreview();
         animation.start(({ finished }) => {
             // console.log('animationStart finished', finished)
             if (finished) {
@@ -90,7 +85,6 @@ export const Scanner = React.forwardRef((_, ref) => {
         });
     };
     const animationStop = (result) => {
-        cameraRef.current?.pausePreview();
         animation.stop();
     };
     const codeScanner = useCodeScanner({
@@ -105,22 +99,30 @@ export const Scanner = React.forwardRef((_, ref) => {
             }
         },
     });
-    if (!show)
+    if (!show || !hasPermission || device == null)
         return null;
-    if (!hasPermission)
-        return <Text>PermissionsPage</Text>;
-    if (device == null)
-        return <Text>NoCameraDeviceError</Text>;
-    return (<TouchableOpacity disabled style={StyleSheet.absoluteFillObject}>
-      <Camera ref={cameraRef} style={styles.camera} device={device} codeScanner={codeScanner} isActive={true}>
+    return (<TouchableOpacity disabled style={StyleSheet.absoluteFill}>
+      <Camera style={StyleSheet.absoluteFill} device={device} codeScanner={codeScanner} isActive={true} torch={torchOn ? "on" : "off"}></Camera>
+
+      <View style={[
+            StyleSheet.absoluteFill,
+            {
+                display: "flex",
+                flexDirection: "column",
+                justifyContent: "center",
+                alignItems: "center",
+                zIndex: 999,
+            },
+        ]}>
         {/* 导航栏 */}
         <View style={{
             display: "flex",
             justifyContent: "center",
             alignItems: "center",
             height: navigationBarHeight,
-            marginTop: statusBarHeight,
-            position: "relative",
+            top: statusBarHeight,
+            left: 0,
+            position: "absolute",
         }}>
           <TouchableOpacity onPress={() => _hideScanner()} style={{
             height: navigationBarHeight,
@@ -163,22 +165,17 @@ export const Scanner = React.forwardRef((_, ref) => {
             <View style={styles.rectangleRight}/>
           </View>
 
-          {/* <TouchableOpacity onPress={() => setTorchOn(!torchOn)}>
-            <Image
-              source={
-                torchOn
-                  ? require("./assets/flashlight-blue.png")
-                  : require("./assets/flashlight-white.png")
-              }
-              style={styles.flashlight}
-            />
-          </TouchableOpacity> */}
+          <TouchableOpacity onPress={() => device.hasTorch && setTorchOn(!torchOn)}>
+            <Image source={torchOn
+            ? require("./assets/flashlight-blue.png")
+            : require("./assets/flashlight-white.png")} style={styles.flashlight}/>
+          </TouchableOpacity>
           <Text style={styles.rectangleText}>
             将二维码/条码放入框内，即可自动扫描
           </Text>
         </View>
         <View style={pointStyle}/>
-      </Camera>
+      </View>
     </TouchableOpacity>);
 });
 const transparent = "#00000000";
@@ -191,7 +188,9 @@ const styles = StyleSheet.create({
         display: "flex",
         flex: 1,
         flexDirection: "column",
-        backgroundColor: "red",
+        // backgroundColor: "red",
+        justifyContent: "center",
+        alignItems: "center",
     },
     cameraBackground: {
         width: px2dp(scanW),

package/ios/PrivacyInfo.xcprivacy

@@ -8,5 +8,11 @@
 	<string>APP需要使用访问您的相册</string>
 	<key>NSAppleMusicUsageDescription</key>
 	<string>APP需要使用访问您的媒体库</string>
+	<!-- VisionCamera -->
+	<key>NSCameraUsageDescription</key>
+	<string>$(PRODUCT_NAME) needs access to your Camera.</string>
+	<!-- optionally, if you want to record audio: -->
+	<key>NSMicrophoneUsageDescription</key>
+	<string>$(PRODUCT_NAME) needs access to your Microphone.</string>
 </dict>
 </plist>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.2.30",
+  "version": "1.2.31",
   "description": "工具箱",
   "exports": {
     ".": {