@aks-dev/easyui 1.0.49 → 1.0.52

package/android/src/main/java/com/easyui/RNEasyuiModule.java

@@ -2,12 +2,13 @@
  * @Author: shiguo
  * @Date: 2022-04-25 17:57:29
  * @LastEditors: shiguo
- * @LastEditTime: 2022-04-27 09:18:14
- * @FilePath: /easy/android/src/main/java/com/easyui/RNEasyuiModule.java
+ * @LastEditTime: 2022-05-31 17:04:47
+ * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/RNEasyuiModule.java
  */
 
 package com.easyui;
 
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
@@ -15,15 +16,30 @@ import com.facebook.react.bridge.Callback;
 
 public class RNEasyuiModule extends ReactContextBaseJavaModule {
 
-  private final ReactApplicationContext reactContext;
+  private final ReactApplicationContext context;
 
   public RNEasyuiModule(ReactApplicationContext reactContext) {
     super(reactContext);
-    this.reactContext = reactContext;
+    this.context = reactContext;
   }
 
   @Override
   public String getName() {
     return "RNEasyui";
   }
+
+  @ReactMethod
+  public void getStatusBarHeight(final Promise promise){
+
+    int status_bar_height = context.getResources().getDimensionPixelSize(context.getResources().getIdentifier("status_bar_height", "dimen", "android"));
+    promise.resolve(status_bar_height);
+  }
+
+  @ReactMethod
+  public void getNavigationBarHeight(final Promise promise){
+
+    int navigation_bar_height = context.getResources().getDimensionPixelSize(context.getResources().getIdentifier("navigation_bar_height", "dimen", "android"));
+    promise.resolve(navigation_bar_height);
+  }
+
 }

package/android/src/main/java/com/{utils → easyui/utils}/RomUtil.java

@@ -1,4 +1,4 @@
-package com.utils;
+package com.easyui.utils;
 
 import android.os.Build;
 import android.text.TextUtils;

package/jsbridge/RNEasyui.ts

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

package/jsbridge/index.ts

@@ -2,9 +2,11 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-24 14:08:39
+ * @LastEditTime: 2022-05-31 17:00:25
  * @FilePath: /@aks-dev/easyui/jsbridge/index.ts
- */
+ */ 
+
+
 /**
  * @description: 获取App版本号
  * @param {*}
@@ -25,4 +27,18 @@
   * @description: app升级
   * @return {*}
   */
- export declare const upgrade: (options: UpgradeOptions) => Promise<string>;
+ export declare const upgrade: (options: UpgradeOptions) => Promise<string>;
+
+
+
+ /**
+  * @description: 获取status_bar_height
+  * @return {*}
+  */
+ export declare const getStatusBarHeight:()=>Promise<number>;
+
+ /**
+  * @description: 获取navigation_bar_height
+  * @return {*}
+  */
+ export declare const getNavigationBarHeight:()=>Promise<number>;

package/package.json

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

package/screen/index.ts

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:25:14
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-16 17:58:40
- * @FilePath: /@aks/easyui/screen/index.ts
+ * @LastEditTime: 2022-05-31 17:19:03
+ * @FilePath: /@aks-dev/easyui/screen/index.ts
  */
 export declare const deviceWidth: number;      //设备的宽度
 export declare const deviceHeight: number;      //设备的高度

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'
 
 
 /// 工具

package/jsbridge/RNEasyui.tsx

@@ -1,13 +0,0 @@
-/*
- * @Author: shiguo
- * @Date: 2022-04-19 10:23:01
- * @LastEditors: shiguo
- * @LastEditTime: 2022-04-27 09:22:46
- * @FilePath: /easy/jsbridge/index.ts
- */
-
-import { NativeModules } from 'react-native';
-
-const { RNEasyui } = NativeModules;
-
-export default RNEasyui;