@aks-dev/easyui 1.0.84 → 1.0.87

package/lib/Hud/Loading/Loading.tsx

@@ -2,11 +2,11 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-12 11:33:21
- * @FilePath: /@aks/easyui/lib/Easy-Hud/Loading/Loading.tsx
+ * @LastEditTime: 2022-07-15 14:21:00
+ * @FilePath: /@aks-dev/easyui/lib/Hud/Loading/Loading.tsx
  */
 import React, { useImperativeHandle, useState } from 'react';
-import { View, ActivityIndicator, StyleSheet, Text, Dimensions,TouchableOpacity } from 'react-native';
+import { View, ActivityIndicator, StyleSheet, Text, Dimensions, TouchableOpacity, BackHandler } from 'react-native';
 
 import type { LoadingCurrent } from '.'
 
@@ -19,6 +19,13 @@ export const Loading = React.forwardRef<LoadingCurrent, {}>((_, ref) => {
     const [tipText, setTipText] = useState('加载中');
 
 
+    React.useEffect(() => {
+        const onBackPress = () => show;
+        BackHandler.addEventListener('hardwareBackPress', onBackPress);
+        return () => BackHandler.removeEventListener('hardwareBackPress', onBackPress);
+    }, [show])
+
+
     useImperativeHandle<unknown, LoadingCurrent>(ref, () => ({
         showLoading: (content?: string) => {
             setShow(true);

package/lib/Hud/PopoverView/PopoverView.tsx

@@ -2,11 +2,11 @@
  * @Author: shiguo
  * @Date: 2022-04-24 14:27:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-15 12:45:52
+ * @LastEditTime: 2022-07-15 14:20:40
  * @FilePath: /@aks-dev/easyui/lib/Hud/PopoverView/PopoverView.tsx
  */
 import React, { useImperativeHandle, useState } from 'react';
-import { StyleSheet, TouchableOpacity } from 'react-native';
+import { StyleSheet, TouchableOpacity, BackHandler } from 'react-native';
 import type { PopoverViewCurrent, PopoverViewOptions } from '.';
 
 
@@ -18,6 +18,12 @@ export const PopoverView = React.forwardRef<PopoverViewCurrent, {}>((_, ref) =>
     const [visible, setVisible] = useState<boolean>(false);
     const [options, setOptions] = useState<Partial<PopoverViewOptions> | undefined>()
 
+    React.useEffect(() => {
+        const onBackPress = () => visible;
+        BackHandler.addEventListener('hardwareBackPress', onBackPress);
+        return () => BackHandler.removeEventListener('hardwareBackPress', onBackPress);
+    }, [visible])
+
 
     useImperativeHandle<unknown, PopoverViewCurrent>(ref, () => ({
         showPopoverView: (options: Partial<PopoverViewOptions>) => {
@@ -35,7 +41,7 @@ export const PopoverView = React.forwardRef<PopoverViewCurrent, {}>((_, ref) =>
         return null;
 
     return (
-        <TouchableOpacity activeOpacity={1}  style={[styles.container,options?.style]} onPress={e=>{
+        <TouchableOpacity activeOpacity={1} style={[styles.container, options?.style]} onPress={e => {
             setVisible(false);
             setOptions(undefined)
             // e.stopPropagation()

package/lib/MenuView/MenuView.tsx

@@ -104,7 +104,7 @@ export default (props: MenuProps) => {
             target_height,
         } = getLayoutInfos()
 
-        const toAlignHorizontal = () => {
+        const layout = () => {
             if (alignHorizontal == 'left') {
                 if (target_width + x > deviceWidth) {
                     return {
@@ -132,17 +132,17 @@ export default (props: MenuProps) => {
         }
         if (alignVertical == 'bottom') {
             y = y + 10
-            return toAlignHorizontal()
+            return layout()
         } else {
             y = (StatusBar.currentHeight || 0) + _container.current.y - target_height - 10
-            return toAlignHorizontal()
+            return layout()
         }
     }
 
 
     const show = () => {
         // console.log('_container', _container.current, StatusBar.currentHeight)
-        if(props.data == undefined || props.data?.length == 0) return
+        if (props.data == undefined || props.data?.length == 0) return
         showPopoverView({
             content: (
                 <TouchableOpacity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.84",
+  "version": "1.0.87",
   "description": "移动端App开发工具包",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",

package/screen/px2sp.ts

@@ -1,3 +1,10 @@
+/*
+ * @Author: shiguo
+ * @Date: 2021-04-27 10:40:36
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-07-18 11:27:22
+ * @FilePath: /@aks-dev/easyui/screen/px2sp.ts
+ */
 import { Dimensions, PixelRatio } from 'react-native';
 const pixelRatio = PixelRatio.get();
 const width = Dimensions.get('window').width;      //设备的宽度
@@ -54,7 +61,8 @@ export const px2sp = (size: number) => {
             return size * 1.25;
         }
         // catch larger phablet devices
-        return size * 1.4;
+
+        return size * 1.3;
     }
     // if older device ie pixelRatio !== 2 || 3 || 3.5
     return size;