@aks-dev/easyui 1.0.51 → 1.0.52

package/jsbridge/RNEasyui.ts

@@ -2,21 +2,18 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 17:06:10
- * @FilePath: /@aks-dev/easyui/jsbridge/RNEasyui.tsx
+ * @LastEditTime: 2022-05-31 17:26:16
+ * @FilePath: /@aks-dev/easyui/jsbridge/RNEasyui.ts
  */
 
-import { NativeModules, Platform, StatusBar, Dimensions } from 'react-native';
+import { Dimensions, NativeModules, Platform } from 'react-native';
 
 const { RNEasyui } = NativeModules;
 
 
 
 
-
-
-
-const getStatusBarHeight = () => {
+export const getStatusBarHeight = () => {
     if (Platform.OS == 'android') return RNEasyui.getStatusBarHeight();
 
     const deviceHeight = Dimensions.get('window').height;
@@ -24,7 +21,7 @@ const getStatusBarHeight = () => {
     if (isiPhoneX) return Promise.resolve(44)
 }
 
-const getNavigationBarHeight = () => {
+export const getNavigationBarHeight = () => {
     if (Platform.OS == 'android') return RNEasyui.getNavigationBarHeight();
     const deviceHeight = Dimensions.get('window').height;
     const isiPhoneX = Platform.OS == 'ios' && (deviceHeight > 736)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.51",
+  "version": "1.0.52",
   "description": "爱科森开发工具包(react-native)",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",

package/screen/index.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:25:14
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 17:09:47
+ * @LastEditTime: 2022-05-31 17:19:03
  * @FilePath: /@aks-dev/easyui/screen/index.ts
  */
 export declare const deviceWidth: number;      //设备的宽度
@@ -13,14 +13,12 @@ export declare const px2dp: (uiElePx: number) => number;
 export declare const px2sp: (fontSize: number) => number;
 export declare const isiPhoneX: boolean;
 /**
- * @deprecated 已废弃，请从jsbridge.getStatusBarHeight()获取
  * @description: 状态栏的高度
  * @param {*}
  * @return {*}
  */
 export declare const statusBarHeight: number;
 /**
- * @deprecated 已废弃，请从jsbridge.getNavigationBarHeight()获取
  * @description: 顶部导航条的高度
  * @param {*}
  * @return {*}

package/screen/{text-set.tsx → init-fit.tsx}

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-15 14:15:07
  * @LastEditors: shiguo
- * @LastEditTime: 2022-04-26 14:39:27
- * @FilePath: /@aks/easy/screen/text-set.tsx
+ * @LastEditTime: 2022-05-31 17:25:13
+ * @FilePath: /@aks-dev/easyui/screen/init-fit.tsx
  */
 /**
  * 全局配置Text
@@ -55,4 +55,13 @@ TextInput.render = function (...args: any[]) {
 if (!Text.defaultProps) Text.defaultProps = {};
 if (!TextInput.defaultProps) TextInput.defaultProps = {};
 Text.defaultProps.allowFontScaling = false
-TextInput.defaultProps.allowFontScaling = false
+TextInput.defaultProps.allowFontScaling = false
+
+
+
+import * as RNEasyui from '../jsbridge/RNEasyui';
+
+
+export const statusBarHeight  = await RNEasyui.getStatusBarHeight()
+
+export const navigationBarHeight  = await RNEasyui.getNavigationBarHeight()

package/screen/px2dp.tsx

@@ -2,10 +2,10 @@
  * @Author: shiguo
  * @Date: 2022-04-18 14:32:25
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-16 17:46:40
- * @FilePath: /@aks/easyui/screen/px2dp.tsx
+ * @LastEditTime: 2022-05-31 17:22:42
+ * @FilePath: /@aks-dev/easyui/screen/px2dp.tsx
  */
-import { Dimensions, StatusBar, Platform } from 'react-native';
+import { Dimensions, Platform } from 'react-native';
 
 
 // 设备宽度，单位 dp
@@ -13,6 +13,7 @@ export const deviceWidth = Dimensions.get('window').width;      //设备的宽
 export const deviceHeight = Dimensions.get('window').height;    //设备的高度
 export const isAndroid = Platform.OS === "android"
 export const isIos = Platform.OS === 'ios'
+export const isiPhoneX = isIos && (deviceHeight > 736)
 
 /** 
  * 375px/667px 
@@ -32,20 +33,21 @@ export const px2dp = (uiElePx: number) => {
 
 
 
-export const isiPhoneX = isIos && (deviceHeight > 736)
 
 
+// export const statusBarHeight = (() => {
+//     if (isAndroid) {
+//         if ((StatusBar.currentHeight || 0) > 20) return 40
+//     }
+//     if (isiPhoneX) return 44
+//     return 20
+// })()
+
+// export const navigationBarHeight = (() => {
+//     if (isAndroid) return statusBarHeight + 44
+//     if (isiPhoneX) return 88
+//     return 64
+// })()
+
 
-export const statusBarHeight = (() => {
-    if (isAndroid) {
-        if ((StatusBar.currentHeight || 0) > 20) return 40
-    }
-    if (isiPhoneX) return 44
-    return 20
-})()
 
-export const navigationBarHeight = (() => {
-    if (isAndroid) return statusBarHeight + 44
-    if (isiPhoneX) return 88
-    return 64
-})()

package/src/index.ts

@@ -3,8 +3,8 @@
  * @Author: shiguo
  * @Date: 2022-04-13 12:47:34
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-16 15:19:39
- * @FilePath: /@aks/easyui/src/index.ts
+ * @LastEditTime: 2022-05-31 17:24:37
+ * @FilePath: /@aks-dev/easyui/src/index.ts
  */
 
 
@@ -53,6 +53,7 @@ export type { EchartsViewProps } from '../lib/Echarts'
 /// 全局适配
 export * from '../screen/px2dp'
 export * from '../screen/px2sp'
+export * from '../screen/init-fit'
 
 
 /// 工具