@aks-dev/easyui 1.0.196 → 1.0.197

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

@@ -1,12 +1,10 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-24 14:27:02
+ * @LastEditors: shiguo
+ * @LastEditTime: 2023-03-23 15:04:18
+ * @FilePath: /@aks-dev/easyui/lib/Hud/Scanner/Scanner.tsx
+ */
 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";
@@ -15,6 +13,11 @@ import { navigationBarHeight, px2dp, statusBarHeight, } from "../../../screen/px
 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;
@@ -32,13 +35,14 @@ export const Scanner = React.forwardRef((_, ref) => {
             return true;
         };
         BackHandler.addEventListener("hardwareBackPress", onBackPress);
+        // return () => BackHandler.removeEventListener('hardwareBackPress', onBackPress);
     }, [show]);
     useImperativeHandle(ref, () => ({
         showScanner: _showScanner,
         hideScanner: _hideScanner,
     }), [show]);
-    const _showScanner = (cb) => __awaiter(void 0, void 0, void 0, function* () {
-        let res = yield requestMultiple([
+    const _showScanner = async (cb) => {
+        let res = await requestMultiple([
             PERMISSIONS.IOS.CAMERA,
             PERMISSIONS.ANDROID.CAMERA,
         ]);
@@ -47,7 +51,7 @@ export const Scanner = React.forwardRef((_, ref) => {
             _scanerResultRef.current = null;
             setShow(true);
             setPointStyle({});
-            yield utils.sleep();
+            await utils.sleep();
             animationStart();
             _cbRef.current = cb;
         }
@@ -55,12 +59,12 @@ export const Scanner = React.forwardRef((_, ref) => {
             _hideScanner();
             showToast("您未开启相机权限，暂不能使用此功能");
         }
-    });
-    const _hideScanner = () => __awaiter(void 0, void 0, void 0, function* () {
+    };
+    const _hideScanner = async () => {
         animationStop();
-        yield utils.sleep();
+        await utils.sleep();
         setShow(false);
-    });
+    };
     const animation = Animated.loop(Animated.sequence([
         Animated.timing(moveAnim, {
             toValue: px2dp(222),
@@ -75,19 +79,18 @@ export const Scanner = React.forwardRef((_, ref) => {
             useNativeDriver: true,
         }),
     ]));
-    const animationStart = () => __awaiter(void 0, void 0, void 0, function* () {
-        var _a;
-        (_a = cameraRef.current) === null || _a === void 0 ? void 0 : _a.resumePreview();
+    const animationStart = async () => {
+        cameraRef.current?.resumePreview();
         animation.start(({ finished }) => {
+            // console.log('animationStart finished', finished)
             if (finished) {
                 animation.reset();
                 animation.start();
             }
         });
-    });
+    };
     const animationStop = (result) => {
-        var _a;
-        (_a = cameraRef.current) === null || _a === void 0 ? void 0 : _a.pausePreview();
+        cameraRef.current?.pausePreview();
         animation.stop();
     };
     const codeScanner = useCodeScanner({
@@ -95,7 +98,7 @@ export const Scanner = React.forwardRef((_, ref) => {
         onCodeScanned: (codes) => {
             console.log(`Scanned ${codes.length} codes!`);
             let code = codes.find((i) => i.value);
-            if ((code === null || code === void 0 ? void 0 : code.value) && _scanerResultRef.current == undefined) {
+            if (code?.value && _scanerResultRef.current == undefined) {
                 _scanerResultRef.current = code.value;
                 _cbRef.current(code.value);
                 _hideScanner();
@@ -105,53 +108,78 @@ export const Scanner = React.forwardRef((_, ref) => {
     if (!show)
         return null;
     if (!hasPermission)
-        return React.createElement(Text, null, "PermissionsPage");
+        return <Text>PermissionsPage</Text>;
     if (device == null)
-        return React.createElement(Text, null, "NoCameraDeviceError");
-    return (React.createElement(TouchableOpacity, { disabled: true, style: StyleSheet.absoluteFillObject },
-        React.createElement(Camera, { ref: cameraRef, style: styles.camera, device: device, codeScanner: codeScanner, isActive: true },
-            React.createElement(View, { style: {
-                    display: "flex",
-                    justifyContent: "center",
-                    alignItems: "center",
-                    height: navigationBarHeight,
-                    marginTop: statusBarHeight,
-                    position: "relative",
-                } },
-                React.createElement(TouchableOpacity, { onPress: () => _hideScanner(), style: {
-                        height: navigationBarHeight,
-                        width: px2dp(50),
-                        paddingLeft: px2dp(15),
-                        position: "absolute",
-                        left: 0,
-                        display: "flex",
-                        justifyContent: "center",
-                    } },
-                    React.createElement(Image, { source: require("./assets/icon_back_white.png"), style: { width: px2dp(20), height: px2dp(20) }, resizeMode: "contain" })),
-                React.createElement(Text, { style: {
-                        fontSize: px2sp(16),
-                        color: "white",
-                        fontWeight: "bold",
-                    } }, "\u626B\u4E00\u626B")),
-            React.createElement(View, { style: styles.scanContainer },
-                React.createElement(View, { style: styles.rectangle },
-                    React.createElement(View, { style: styles.rectangleLeft }),
-                    React.createElement(View, { style: styles.cameraBackground },
-                        React.createElement(Animated.View, { style: [
-                                styles.scanLine,
-                                { transform: [{ translateY: moveAnim }] },
-                            ] }),
-                        React.createElement(View, { style: styles.reactLineTopLeftX }),
-                        React.createElement(View, { style: styles.reactLineTopLeftY }),
-                        React.createElement(View, { style: styles.reactLineTopRightX }),
-                        React.createElement(View, { style: styles.reactLineTopRightY }),
-                        React.createElement(View, { style: styles.reactLineBottomLeftX }),
-                        React.createElement(View, { style: styles.reactLineBottomLeftY }),
-                        React.createElement(View, { style: styles.reactLineBottomRightX }),
-                        React.createElement(View, { style: styles.reactLineBottomRightY })),
-                    React.createElement(View, { style: styles.rectangleRight })),
-                React.createElement(Text, { style: styles.rectangleText }, "\u5C06\u4E8C\u7EF4\u7801/\u6761\u7801\u653E\u5165\u6846\u5185\uFF0C\u5373\u53EF\u81EA\u52A8\u626B\u63CF")),
-            React.createElement(View, { style: pointStyle }))));
+        return <Text>NoCameraDeviceError</Text>;
+    return (<TouchableOpacity disabled style={StyleSheet.absoluteFillObject}>
+      <Camera ref={cameraRef} style={styles.camera} device={device} codeScanner={codeScanner} isActive={true}>
+        {/* 导航栏 */}
+        <View style={{
+            display: "flex",
+            justifyContent: "center",
+            alignItems: "center",
+            height: navigationBarHeight,
+            marginTop: statusBarHeight,
+            position: "relative",
+        }}>
+          <TouchableOpacity onPress={() => _hideScanner()} style={{
+            height: navigationBarHeight,
+            width: px2dp(50),
+            paddingLeft: px2dp(15),
+            position: "absolute",
+            left: 0,
+            display: "flex",
+            justifyContent: "center",
+        }}>
+            <Image source={require("./assets/icon_back_white.png")} style={{ width: px2dp(20), height: px2dp(20) }} resizeMode="contain"/>
+          </TouchableOpacity>
+          <Text style={{
+            fontSize: px2sp(16),
+            color: "white",
+            fontWeight: "bold",
+        }}>
+            扫一扫
+          </Text>
+        </View>
+
+        {/* 动画框 */}
+        <View style={styles.scanContainer}>
+          <View style={styles.rectangle}>
+            <View style={styles.rectangleLeft}/>
+            <View style={styles.cameraBackground}>
+              <Animated.View style={[
+            styles.scanLine,
+            { transform: [{ translateY: moveAnim }] },
+        ]}/>
+              <View style={styles.reactLineTopLeftX}/>
+              <View style={styles.reactLineTopLeftY}/>
+              <View style={styles.reactLineTopRightX}/>
+              <View style={styles.reactLineTopRightY}/>
+              <View style={styles.reactLineBottomLeftX}/>
+              <View style={styles.reactLineBottomLeftY}/>
+              <View style={styles.reactLineBottomRightX}/>
+              <View style={styles.reactLineBottomRightY}/>
+            </View>
+            <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> */}
+          <Text style={styles.rectangleText}>
+            将二维码/条码放入框内，即可自动扫描
+          </Text>
+        </View>
+        <View style={pointStyle}/>
+      </Camera>
+    </TouchableOpacity>);
 });
 const transparent = "#00000000";
 const lineColor = "#6ab3ff";
@@ -269,5 +297,5 @@ const styles = StyleSheet.create({
     grantedText: { lineHeight: px2dp(30), color: lineColor, fontWeight: "bold" },
 });
 export const scannerRef = React.createRef();
-export const showScanner = (cb) => { var _a; return (_a = scannerRef.current) === null || _a === void 0 ? void 0 : _a.showScanner(cb); };
-export const hideScanner = () => { var _a; return (_a = scannerRef.current) === null || _a === void 0 ? void 0 : _a.hideScanner(); };
+export const showScanner = (cb) => scannerRef.current?.showScanner(cb);
+export const hideScanner = () => scannerRef.current?.hideScanner();

package/dist/components/Hud/Toast/Toast.js

@@ -1,3 +1,10 @@
+/*
+ * @Author: shiguo
+ * @Date: 2021-04-27 10:38:04
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-09-09 10:58:34
+ * @FilePath: /@aks-dev/easyui/lib/Hud/Toast/Toast.tsx
+ */
 import React, { useImperativeHandle, useState, useRef } from "react";
 import { View, StyleSheet, Text, Dimensions, Animated, Easing, } from "react-native";
 const errorMsg = "(^_^)∠※ 送你一束小花";
@@ -26,14 +33,16 @@ export const Toast = React.forwardRef((_, ref) => {
             fadeAnimation.start();
         },
     }));
-    return (React.createElement(Animated.View, { style: Object.assign(Object.assign({}, styles.toastContainer), { opacity: fade }) },
-        React.createElement(View, { style: styles.toastTipsContainer },
-            React.createElement(Text, { numberOfLines: 5, style: Object.assign({}, styles.toastTitle) },
-                tipText,
-                " "))));
+    return (<Animated.View style={{ ...styles.toastContainer, opacity: fade }}>
+      <View style={styles.toastTipsContainer}>
+        <Text numberOfLines={5} style={{ ...styles.toastTitle }}>
+          {tipText}{" "}
+        </Text>
+      </View>
+    </Animated.View>);
 });
 export const toastRef = React.createRef();
-export const showToast = (content) => { var _a; return (_a = toastRef.current) === null || _a === void 0 ? void 0 : _a.showToast(content); };
+export const showToast = (content) => toastRef.current?.showToast(content);
 const SCREEN_WIDTH = Dimensions.get("window").width;
 const styles = StyleSheet.create({
     toastContainer: {
@@ -47,6 +56,7 @@ const styles = StyleSheet.create({
         position: "absolute",
         backgroundColor: "#00000088",
         padding: 10,
+        // paddingVertical: 4,
         borderRadius: 2,
         justifyContent: "center",
         alignItems: "center",

package/dist/components/MenuView/MenuView.js

@@ -1,26 +1,35 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import React from "react";
 import { Image, ScrollView, Text, TouchableOpacity, View, } from "react-native";
 import { deviceHeight, deviceWidth } from "../../screen/px2dp";
+// import * as utils from '../../utils/lazy';
 import { hidePopoverView, showPopoverView } from "../Hud/Hud";
+// type Reducer = (prevState: State, action: Partial<State>) => State
 export default (props) => {
     const { defaultAlignHorizontal = "left", defaultAlignVertical = "bottom" } = props;
     const [state, dispatch] = React.useReducer((prevState, action) => Object.assign({}, prevState, action), {});
+    // const containerRef = React.useRef<{ measureInWindow: (callback: MeasureInWindowOnSuccessCallback) => void }>()
     const containerRef = React.useRef(null);
     const rootView = React.useRef({ pageX: 0, pageY: 0, width: 0, height: 0 });
     const sc = React.useRef({ x: 0, y: 0, width: 0, height: 0 });
+    // React.useEffect(() => {
+    //     ; (async () => {
+    //         await utils.sleep()
+    //         containerRef.current?.measure((...args) => {
+    //             console.log('containerRef', args)
+    //             if (args.length == 6) {
+    //                 _container.current = {
+    //                     x: args[4],
+    //                     y: args[5],
+    //                     width: args[2],
+    //                     height: args[3],
+    //                 }
+    //             }
+    //         })
+    //     })()
+    // })
     const getRootViewlayoutPromise = () => {
         return new Promise((resovle, reject) => {
-            var _a;
-            (_a = containerRef.current) === null || _a === void 0 ? void 0 : _a.measure((...args) => {
+            containerRef.current?.measure((...args) => {
                 if (args.length == 6) {
                     rootView.current = {
                         width: args[2],
@@ -29,17 +38,18 @@ export default (props) => {
                         pageY: args[5],
                     };
                 }
+                // console.log('RootView', rootView.current)
                 resovle(args);
             });
         });
     };
     const getLayoutInfos = () => {
-        var _a;
         let alignVertical = defaultAlignVertical;
         let alignHorizontal = defaultAlignHorizontal;
         let width = rootView.current.width;
         let height = rootView.current.height;
         let x = rootView.current.pageX;
+        // let y = (StatusBar.currentHeight || 0) + _container.current.y + height
         let y = rootView.current.pageY + height;
         if (x > Math.abs(deviceWidth - width - x)) {
             alignHorizontal = "right";
@@ -47,8 +57,9 @@ export default (props) => {
         if (y > deviceHeight * 0.5) {
             alignVertical = "top";
         }
+        /**todo: target_width的获取是延迟的，所以这里又问题 */
         const target_width = sc.current.width;
-        const target_height = CELL_HEIGHT * (Math.min(((_a = props.data) === null || _a === void 0 ? void 0 : _a.length) || 0, 5) || 0);
+        const target_height = CELL_HEIGHT * (Math.min(props.data?.length || 0, 5) || 0);
         return {
             alignVertical,
             alignHorizontal,
@@ -62,6 +73,7 @@ export default (props) => {
     };
     const reLayout = () => {
         let { alignVertical, alignHorizontal, width, height, x, y, target_width, target_height, } = getLayoutInfos();
+        // console.log({ getLayoutInfos: getLayoutInfos() })
         const layout = () => {
             if (alignHorizontal == "left") {
                 if (target_width + x > deviceWidth) {
@@ -101,15 +113,34 @@ export default (props) => {
     const PADDING = 10;
     const ARROW_HEIGHT = 12;
     const CELL_HEIGHT = 36;
-    const show = () => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+    const show = async () => {
         props.onContainerClick && props.onContainerClick();
-        if (props.data == undefined || ((_a = props.data) === null || _a === void 0 ? void 0 : _a.length) == 0)
+        if (props.data == undefined || props.data?.length == 0)
             return;
-        yield getRootViewlayoutPromise();
+        /**重新获取rootview的定位 */
+        await getRootViewlayoutPromise();
+        /**重新获取rootview的定位 */
         showPopoverView({
-            content: (React.createElement(TouchableOpacity, { activeOpacity: 1, style: Object.assign({ position: "absolute", minWidth: deviceWidth * 0.36, maxWidth: deviceWidth * 0.8, minHeight: CELL_HEIGHT + PADDING * 2, maxHeight: CELL_HEIGHT * 5 + PADDING * 2, borderRadius: 6, backgroundColor: "#000000ee", padding: PADDING }, reLayout()) },
-                React.createElement(View, { style: Object.assign({ width: ARROW_HEIGHT, height: ARROW_HEIGHT, backgroundColor: "#000000ee", position: "absolute", zIndex: 1, transform: [{ rotateZ: "45deg" }] }, (() => {
+            content: (<TouchableOpacity activeOpacity={1} style={{
+                    position: "absolute",
+                    minWidth: deviceWidth * 0.36,
+                    maxWidth: deviceWidth * 0.8,
+                    minHeight: CELL_HEIGHT + PADDING * 2,
+                    maxHeight: CELL_HEIGHT * 5 + PADDING * 2,
+                    borderRadius: 6,
+                    backgroundColor: "#000000ee",
+                    // overflow: 'hidden' ,
+                    padding: PADDING,
+                    ...reLayout(),
+                }}>
+          <View style={{
+                    width: ARROW_HEIGHT,
+                    height: ARROW_HEIGHT,
+                    backgroundColor: "#000000ee",
+                    position: "absolute",
+                    zIndex: 1,
+                    transform: [{ rotateZ: "45deg" }],
+                    ...(() => {
                         const { alignVertical, alignHorizontal } = getLayoutInfos();
                         if (alignVertical == "bottom" && alignHorizontal == "left")
                             return { left: "20%", top: -5 };
@@ -120,24 +151,34 @@ export default (props) => {
                         if (alignVertical == "top" && alignHorizontal == "right")
                             return { right: "20%", bottom: -5 };
                         return {};
-                    })()) }),
-                React.createElement(ScrollView, { onLayout: (e) => {
-                        let _sc = e.nativeEvent.layout;
-                        sc.current = _sc;
-                    } }, (_b = props.data) === null || _b === void 0 ? void 0 : _b.map((i, idx) => {
-                    return (React.createElement(TouchableOpacity, { activeOpacity: 0.7, key: `sg-memnu-${idx}`, style: {
+                    })(),
+                }}/>
+
+          <ScrollView onLayout={(e) => {
+                    // console.log('target onLayout', e.nativeEvent.layout)
+                    let _sc = e.nativeEvent.layout;
+                    sc.current = _sc;
+                }}>
+            {props.data?.map((i, idx) => {
+                    return (<TouchableOpacity activeOpacity={0.7} key={`sg-memnu-${idx}`} style={{
                             height: CELL_HEIGHT,
                             display: "flex",
                             flexDirection: "row",
                             alignItems: "center",
-                        }, onPress: (e) => {
+                            // ,backgroundColor:utils.randomcolor()
+                        }} onPress={(e) => {
                             props.onItemClick && props.onItemClick(idx, i.extra);
                             hidePopoverView();
-                        } },
-                        i.icon && (React.createElement(Image, { style: { width: 18, height: 18, marginRight: 4 }, source: i.icon })),
-                        React.createElement(Text, { style: { flexShrink: 1, fontSize: 14, color: "white" } }, i.text)));
-                })))),
+                        }}>
+                  {i.icon && (<Image style={{ width: 18, height: 18, marginRight: 4 }} source={i.icon}/>)}
+                  <Text style={{ flexShrink: 1, fontSize: 14, color: "white" }}>
+                    {i.text}
+                  </Text>
+                </TouchableOpacity>);
+                })}
+          </ScrollView>
+        </TouchableOpacity>),
         });
-    });
-    return (React.createElement(TouchableOpacity, Object.assign({ ref: containerRef, onPress: (e) => show() }, props)));
+    };
+    return (<TouchableOpacity ref={containerRef} onPress={(e) => show()} {...props}/>);
 };

package/dist/components/Modal/Modal.js

@@ -1 +1,8 @@
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-26 11:30:34
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-10-27 16:37:32
+ * @FilePath: /@aks-dev/easyui/lib/Modal/Modal.tsx
+ */
 export { default as Modal } from 'react-native-modal';