@aks-dev/easyui 1.0.151 → 1.0.154

package/jsbridge/UpgradeModule.ts

@@ -2,14 +2,14 @@
  * @Author: shiguo
  * @Date: 2022-05-05 14:19:39
  * @LastEditors: shiguo
- * @LastEditTime: 2022-10-24 16:13:01
+ * @LastEditTime: 2023-03-23 15:15:06
  * @FilePath: /@aks-dev/easyui/jsbridge/UpgradeModule.ts
  */
 import { NativeModules, PermissionsAndroid, Platform } from 'react-native';
 
 const { UpgradeModule } = NativeModules;
 
-import type { UpgradeOptions } from '.'
+import type { UpgradeOptions } from './index.d'
 
 export const getAppVersion = () => UpgradeModule.getAppVersion();
 

package/jsbridge/index.d.ts

@@ -0,0 +1,67 @@
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-19 10:23:01
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-10-24 16:38:59
+ * @FilePath: /@aks-dev/easyui/jsbridge/index.ts
+ */
+
+
+/**
+ * @description: 获取App版本号
+ * @param {*}
+ * @return {*}
+ */
+export declare const getAppVersion: () => Promise<string>;
+
+/**
+ * @description: 获取操作系统版本
+ * 
+ react-native-device-info
+ * @return {*}
+ */
+export declare const getOSVersion: () => Promise<string>;
+
+/**
+ * @description: 获取设备品牌
+ * @return {*}
+ */
+export declare const getDeviceBrand: () => Promise<string>;
+
+
+export declare type UpgradeOptions = {
+    title?: string;
+    version: string;
+    downloadUrl: string;
+    note: string;
+    force: boolean;
+};
+
+/**
+ * @description: app升级
+ * @return {*}
+ */
+export declare const upgrade: (options: UpgradeOptions) => Promise<string>;
+
+
+
+/**
+ * @deprecated 测量不准确，已放弃
+ * @description: 获取status_bar_height
+ * @return {*}
+ */
+export declare const getStatusBarHeight: () => Promise<number>;
+
+/**
+ * @deprecated 测量不准确，已放弃
+ * @description: 获取navigation_bar_height
+ * @return {*}
+ */
+export declare const getNavigationBarHeight: () => Promise<number>;
+
+
+/**
+ * only android
+ * 返回桌面
+ */
+export declare const gotoDesktop: ()=>void;

package/jsbridge/index.ts

@@ -2,66 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-10-24 16:38:59
+ * @LastEditTime: 2023-03-23 15:14:55
  * @FilePath: /@aks-dev/easyui/jsbridge/index.ts
  */
-
-
-/**
- * @description: 获取App版本号
- * @param {*}
- * @return {*}
- */
-export declare const getAppVersion: () => Promise<string>;
-
-/**
- * @description: 获取操作系统版本
- * 
- react-native-device-info
- * @return {*}
- */
-export declare const getOSVersion: () => Promise<string>;
-
-/**
- * @description: 获取设备品牌
- * @return {*}
- */
-export declare const getDeviceBrand: () => Promise<string>;
-
-
-export declare type UpgradeOptions = {
-    title?: string;
-    version: string;
-    downloadUrl: string;
-    note: string;
-    force: boolean;
-};
-
-/**
- * @description: app升级
- * @return {*}
- */
-export declare const upgrade: (options: UpgradeOptions) => Promise<string>;
-
-
-
-/**
- * @deprecated 测量不准确，已放弃
- * @description: 获取status_bar_height
- * @return {*}
- */
-export declare const getStatusBarHeight: () => Promise<number>;
-
-/**
- * @deprecated 测量不准确，已放弃
- * @description: 获取navigation_bar_height
- * @return {*}
- */
-export declare const getNavigationBarHeight: () => Promise<number>;
-
-
-/**
- * only android
- * 返回桌面
- */
-export declare const gotoDesktop: ()=>void;
+export * from './RNEasyui'
+export * from './UpgradeModule'

package/lib/Hud/Scanner/Scanner.tsx

@@ -2,14 +2,14 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2023-03-23 12:37:10
+ * @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, StyleProp, StyleSheet, Text, TouchableOpacity, View, ViewStyle
 } from 'react-native';
-import { RNCamera } from 'react-native-camera';
+import { RNCamera, BarCodeReadEvent } from 'react-native-camera';
 import { PERMISSIONS, requestMultiple } from 'react-native-permissions';
 import { navigationBarHeight, px2dp, statusBarHeight } from '../../../screen/px2dp';
 import { px2sp } from '../../../screen/px2sp';
@@ -29,12 +29,12 @@ import { ScannerOptions } from './index';
 // }
 
 export const Scanner = React.forwardRef<ScannerOptions.RefAttributes, {}>((_, ref) => {
-    const [show, setShow] = useState(false);
-    const [torchOn, setTorchOn] = React.useState(false)
+    const [show, setShow] = useState<boolean>(false);
+    const [torchOn, setTorchOn] = React.useState<boolean>(false)
     const moveAnim = React.useRef(new Animated.Value(0)).current
     const [pointStyle, setPointStyle] = React.useState<StyleProp<ViewStyle>>()
-    const cameraRef = React.useRef<RNCamera>()
-    const _cbRef = React.useRef<ScannerOptions.CallBack>()
+    const cameraRef: React.MutableRefObject<RNCamera> = React.useRef() as any
+    const _cbRef: React.MutableRefObject<ScannerOptions.CallBack> = React.useRef() as any
     const _scanerResultRef = React.useRef<any>()
     React.useEffect(() => {
         const onBackPress = () => {
@@ -145,7 +145,7 @@ export const Scanner = React.forwardRef<ScannerOptions.RefAttributes, {}>((_, re
     // }
 
 
-    const onBarCodeRead = (e) => {
+    const onBarCodeRead = (e: BarCodeReadEvent) => {
         // console.log('ss onBarCodeRead: ', JSON.stringify(e))
         if (e?.data?.length > 0 && _scanerResultRef.current == undefined) {
             _scanerResultRef.current = e?.data
@@ -162,8 +162,7 @@ export const Scanner = React.forwardRef<ScannerOptions.RefAttributes, {}>((_, re
 
     if (!show) return null;
     return (
-        <TouchableOpacity disabled style={styles.container}>
-
+        <TouchableOpacity disabled style={StyleSheet.absoluteFillObject}>
             <RNCamera
                 ref={cameraRef}
                 captureAudio={false}
@@ -201,9 +200,7 @@ export const Scanner = React.forwardRef<ScannerOptions.RefAttributes, {}>((_, re
                         <View style={styles.rectangleRight} />
                     </View>
 
-                    <TouchableOpacity onPress={() => {
-                        setTorchOn(!torchOn)
-                    }}>
+                    <TouchableOpacity onPress={() => setTorchOn(!torchOn)}>
                         <Image
                             source={torchOn ? require('./flashlight-blue.png') : require('./flashlight-white.png')}
                             style={styles.flashlight} />
@@ -225,9 +222,6 @@ const scanW = 225
 const scanCornerLineLength = 15;
 const scanCornerLineHeight = 3
 const styles = StyleSheet.create({
-    container: {
-        ...StyleSheet.absoluteFillObject,
-    },
     camera: { display: 'flex', flex: 1, flexDirection: 'column', backgroundColor: "red" },
     cameraBackground: { width: px2dp(scanW), height: px2dp(scanW), backgroundColor: transparent },
     scanContainer: { display: 'flex', flex: 1, justifyContent: 'center', alignItems: 'center' },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.151",
+  "version": "1.0.154",
   "description": "工具箱",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",
@@ -39,9 +39,9 @@
     "@aks-dev/react-native-syan-image-picker": "*",
     "react": "*",
     "react-native": "*",
-    "react-native-webview": "*",
+    "react-native-camera": "*",
     "react-native-permissions": "*",
-    "react-native-camera": "*"
+    "react-native-webview": "*"
   },
   "dependencies": {
     "echarts": "^5.3.2",
@@ -54,6 +54,8 @@
     "@aks-dev/react-native-syan-image-picker": "^0.5.58",
     "@types/react": "^17.0.39",
     "@types/react-native": "^0.67.4",
+    "react-native-camera": "^4.2.1",
+    "react-native-permissions": "^3.8.0",
     "react-native-webview": "^11.18.2",
     "tslib": "^2.4.0",
     "typescript": "^4.6.3"

package/screen/index.d.ts

@@ -0,0 +1,26 @@
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-19 10:25:14
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-05-31 18:34:57
+ * @FilePath: /@aks-dev/easyui/screen/index.ts
+ */
+export declare const deviceWidth: number;      //设备的宽度
+export declare const deviceHeight: number;      //设备的高度
+export declare const isAndroid: boolean;
+export declare const isIos: boolean;
+export declare const px2dp: (uiElePx: number) => number;
+export declare const px2sp: (fontSize: number) => number;
+export declare const isiPhoneX: boolean;
+/**
+ * @description: 状态栏的高度
+ * @param {*}
+ * @return {*}
+ */
+export declare const statusBarHeight: number;
+/**
+ * @description: 顶部导航条的高度,高度不包含statusBarHeight
+ * @param {*}
+ * @return {*}
+ */
+export declare const navigationBarHeight: number; 

package/screen/index.ts

@@ -2,25 +2,9 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:25:14
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 18:34:57
+ * @LastEditTime: 2023-03-23 15:09:24
  * @FilePath: /@aks-dev/easyui/screen/index.ts
  */
-export declare const deviceWidth: number;      //设备的宽度
-export declare const deviceHeight: number;      //设备的高度
-export declare const isAndroid: boolean;
-export declare const isIos: boolean;
-export declare const px2dp: (uiElePx: number) => number;
-export declare const px2sp: (fontSize: number) => number;
-export declare const isiPhoneX: boolean;
-/**
- * @description: 状态栏的高度
- * @param {*}
- * @return {*}
- */
-export declare const statusBarHeight: number;
-/**
- * @description: 顶部导航条的高度,高度不包含statusBarHeight
- * @param {*}
- * @return {*}
- */
-export declare const navigationBarHeight: number; 
+/// 全局适配
+export * from '../screen/px2dp'
+export * from '../screen/px2sp'

package/src/index.d.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-26 11:44:22
  * @LastEditors: shiguo
- * @LastEditTime: 2023-03-23 12:33:55
+ * @LastEditTime: 2023-03-23 15:24:35
  * @FilePath: /@aks-dev/easyui/src/index.d.ts
  */
 
@@ -11,46 +11,28 @@
 /// 组件 easy-ui
 
 export * from '../lib/Badge'
-
 export * from '../lib/Hud'
-
 export * from '../lib/Modal'
-
 export * from '../lib/MutiPictureView'
-
 export * from '../lib/PictureViewer'
-
 export * from '../lib/RefreshList'
-
 export * from '../lib/TableCell'
-
 export * from '../lib/TextInputArea'
-
 export * from '../lib/WithLoadingContainer'
-
-
 export * from '../lib/StickHeaderView'
-
 export * from '../lib/Echarts'
-
-/// 全局适配
-export * from '../screen'
-
-
 export * from '../lib/RichText'
-
-
 export * from '../lib/DottedLine'
-
 export * from '../lib/MenuView'
 export * from '../lib/AnimationModal'
 
 
+
+/// 全局适配
+export * from '../screen/index.d'
 /// 工具
-import * as utils from '../utils'
-export {
-    utils
-}
+export * as utils from '../utils/index.d'
+export * as jsbridge from '../jsbridge/index.d'
 
 //通用类型
 export type ItemProps = {
@@ -58,7 +40,3 @@ export type ItemProps = {
     index: number
 }
 
-
-
-///
-export * as jsbridge from '../jsbridge'

package/src/index.ts

@@ -3,7 +3,7 @@
  * @Author: shiguo
  * @Date: 2022-04-13 12:47:34
  * @LastEditors: shiguo
- * @LastEditTime: 2023-03-23 12:34:09
+ * @LastEditTime: 2023-03-23 15:24:12
  * @FilePath: /@aks-dev/easyui/src/index.ts
  */
 
@@ -22,55 +22,33 @@ export {
     showAlertBottomModal,
     showAlertSheetModal,
     showPopoverView, hidePopoverView,
-    showScanner,hideScanner
+    showScanner, hideScanner
 } from '../lib/Hud/Hud'
-
 export * from '../lib/Modal/Modal'
-
 export { default as MutiPictureView } from '../lib/MutiPictureView/MutiPictureView'
-
 export { PictureViewer } from '../lib/PictureViewer/PictureViewer'
-
 export { default as RefreshList } from '../lib/RefreshList/RefreshList'
 export { RefreshState } from '../lib/RefreshList'
-
-
 export { default as TableCell } from '../lib/TableCell/TableCell'
-
-
 export { default as TextInputArea } from '../lib/TextInputArea/TextInputArea'
-
-
 export { default as WithLoadingContainer } from '../lib/WithLoadingContainer/WithLoadingContainer'
 export { WithLoadingContainerProps, Status } from '../lib/WithLoadingContainer'
-
-
 export { default as StickHeaderView } from '../lib/StickHeaderView/StickHeaderView'
-
 export { default as EchartsView } from '../lib/Echarts/EchartsView'
 export { echarts } from '../lib/Echarts'
-
 export { default as RichText } from '../lib/RichText/RichText'
 export { default as DottedLine } from '../lib/DottedLine/DottedLine'
-
 export { default as MenuView } from '../lib/MenuView/MenuView'
-
-
 export { AnimationModal } from '../lib/AnimationModal/AnimationModal'
 
 
 /// 全局适配
-export * from '../screen/px2dp'
-export * from '../screen/px2sp'
-
+export * from '../screen'
 /// 工具
-import * as mode from '../utils/mode'
-import * as lazy from '../utils/lazy'
-export const utils = Object.assign({}, mode, lazy)
-
-
-
+import * as utils from '../utils'
 ///  桥接
-import * as UpgradeModule from '../jsbridge/UpgradeModule'
-import * as RNEasyui from '../jsbridge/RNEasyui'
-export const jsbridge = Object.assign({}, UpgradeModule,RNEasyui)
+import * as jsbridge from '../jsbridge'
+export {
+    utils,
+    jsbridge
+}

package/utils/index.d.ts

@@ -0,0 +1,96 @@
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-19 10:25:43
+ * @LastEditors: shiguo
+ * @LastEditTime: 2023-02-28 12:07:51
+ * @FilePath: /@aks-dev/easyui/utils/index.ts
+ */
+
+import * as rn from 'react-native';
+
+/**
+ * @description: 睡眠时间
+ * @param {*}毫秒值
+ * @return {*}
+ */
+type TArgs = (args: void) => void;
+export declare const sleep: (msec?: number) => Promise<TArgs>;
+
+
+/**
+ * @description: 通过手势关闭键盘
+ * @return {*}
+ */
+export declare const keyboardDismissHandlers: rn.GestureResponderHandlers;
+
+export type CallBack = (...args: any[]) => void;
+
+
+
+
+/**
+ * @description: 手势动作回调
+ * @param {*}
+ * @return {*}
+ */
+export declare const panHandlersCallback: (props: { GrantCallback: CallBack, MoveCallback: CallBack, ReleaseCallback: CallBack }) => void;
+
+/**
+ * @description: 拨打电话
+ * @param {number} phone
+ * @return {*}
+ */
+export declare const callTelephone: (phone: number | string) => void;
+
+/**
+ * @description: 获取随机色
+ * @param {*}
+ * @return {*}
+ */
+export declare const randomcolor: () => string;
+
+
+
+export type SyncLoopCallBack = (item: any, index: number) => void;
+/**
+ * @description: 同步循环
+ * @param {*} dataList：数据源
+ * @return {*}
+ */
+export declare const syncLoop: (dataList: any[], callback: SyncLoopCallBack) => Promise<string>;
+
+
+/**
+ * @description: 对11位手机号码加*
+ * @return {*}
+ */
+export declare const encryptMobilePhoneNumber: (text: string) => string;
+/**
+ * @description: 判断对象
+ * @return {*}
+ */
+export declare const isObject: (exp: any) => boolean;
+export declare const isArray: (exp: any) => boolean;
+export declare const isString: (exp: any) => boolean;
+export declare const isNumber: (exp: any) => boolean;
+export declare const isNull: (exp: any) => boolean;
+export declare const isNullObject: (obj: any) => boolean;
+export declare const isUndefined: (exp: any) => boolean;
+export declare const isObjectValueEqual: (a: any, b: any) => boolean;
+export declare const deepEqual: (x: any, y: any) => boolean;
+export declare function deepClone(target: any): any;
+export declare const isPhoneNumber: (str: string) => boolean;
+export declare const toDateFriendly: (dateStr: string) => string;
+export declare const isChainChar: (str: string) => boolean;
+export declare const isHaveChartCount: (str: string) => number;
+export declare const isHaveNumberCount: (str: string) => number;
+export declare const isHaveChinese: (text: string) => boolean;
+export declare const isHaveEmojiCharact: (substring: string) => boolean;
+
+
+/**
+* @description: 获得32位随机字符
+* @return {*}
+*/
+export declare const getUuid: () => string;
+

package/utils/index.ts

@@ -2,95 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:25:43
  * @LastEditors: shiguo
- * @LastEditTime: 2023-02-28 12:07:51
+ * @LastEditTime: 2023-03-23 15:08:21
  * @FilePath: /@aks-dev/easyui/utils/index.ts
  */
-
-import * as rn from 'react-native';
-
-/**
- * @description: 睡眠时间
- * @param {*}毫秒值
- * @return {*}
- */
-type TArgs = (args: void) => void;
-export declare const sleep: (msec?: number) => Promise<TArgs>;
-
-
-/**
- * @description: 通过手势关闭键盘
- * @return {*}
- */
-export declare const keyboardDismissHandlers: rn.GestureResponderHandlers;
-
-export type CallBack = (...args: any[]) => void;
-
-
-
-
-/**
- * @description: 手势动作回调
- * @param {*}
- * @return {*}
- */
-export declare const panHandlersCallback: (props: { GrantCallback: CallBack, MoveCallback: CallBack, ReleaseCallback: CallBack }) => void;
-
-/**
- * @description: 拨打电话
- * @param {number} phone
- * @return {*}
- */
-export declare const callTelephone: (phone: number | string) => void;
-
-/**
- * @description: 获取随机色
- * @param {*}
- * @return {*}
- */
-export declare const randomcolor: () => string;
-
-
-
-export type SyncLoopCallBack = (item: any, index: number) => void;
-/**
- * @description: 同步循环
- * @param {*} dataList：数据源
- * @return {*}
- */
-export declare const syncLoop: (dataList: any[], callback: SyncLoopCallBack) => Promise<string>;
-
-
-/**
- * @description: 对11位手机号码加*
- * @return {*}
- */
-export declare const encryptMobilePhoneNumber: (text: string) => string;
-/**
- * @description: 判断对象
- * @return {*}
- */
-export declare const isObject: (exp: any) => boolean;
-export declare const isArray: (exp: any) => boolean;
-export declare const isString: (exp: any) => boolean;
-export declare const isNumber: (exp: any) => boolean;
-export declare const isNull: (exp: any) => boolean;
-export declare const isNullObject: (obj: any) => boolean;
-export declare const isUndefined: (exp: any) => boolean;
-export declare const isObjectValueEqual: (a: any, b: any) => boolean;
-export declare const deepEqual: (x: any, y: any) => boolean;
-export declare function deepClone(target: any): any;
-export declare const isPhoneNumber: (str: string) => boolean;
-export declare const toDateFriendly: (dateStr: string) => string;
-export declare const isChainChar: (str: string) => boolean;
-export declare const isHaveChartCount: (str: string) => number;
-export declare const isHaveNumberCount: (str: string) => number;
-export declare const isHaveChinese: (text: string) => boolean;
-export declare const isHaveEmojiCharact: (substring: string) => boolean;
-
-
-/**
-* @description: 获得32位随机字符
-* @return {*}
-*/
-export declare const getUuid: () => string;
-
+export * from '../utils/mode'
+export * from '../utils/lazy'

package/utils/lazy.ts

@@ -2,10 +2,10 @@
  * @Author: shiguo
  * @Date: 2022-04-27 18:17:54
  * @LastEditors: shiguo
- * @LastEditTime: 2023-03-10 14:04:08
+ * @LastEditTime: 2023-03-23 15:07:44
  * @FilePath: /@aks-dev/easyui/utils/lazy.ts
  */
-import type { SyncLoopCallBack } from '.'
+import type { SyncLoopCallBack } from './index.d'
 
 export const sleep = (msec?: number) => {
     return new Promise(resolve => {

package/utils/mode.ts

@@ -2,10 +2,10 @@
  * @Author: shiguo
  * @Date: 2022-04-18 18:40:07
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-20 10:17:07
+ * @LastEditTime: 2023-03-23 15:07:57
  * @FilePath: /@aks-dev/easyui/utils/mode.ts
  */
-import type { CallBack } from '.'
+import type { CallBack } from './index.d'