@aks-dev/easyui 1.0.52 → 1.0.55

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

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-25 17:57:29
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 17:04:47
+ * @LastEditTime: 2022-05-31 18:19:20
  * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/RNEasyuiModule.java
  */
 
@@ -12,34 +12,51 @@ import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.Callback;
 
 public class RNEasyuiModule extends ReactContextBaseJavaModule {
 
-  private final ReactApplicationContext context;
+    private final ReactApplicationContext context;
+
+    public RNEasyuiModule(ReactApplicationContext reactContext) {
+        super(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);
+        int result = 0;
+        int resId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resId > 0) {
+            result = context.getResources().getDimensionPixelSize(resId);
+        }
+        promise.resolve(result);
+
+    }
+
+    @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);
+
+        int resourceId = 0;
+        int rid = context.getResources().getIdentifier("config_showNavigationBar", "bool", "android");
+        if (rid != 0) {
+            resourceId = context.getResources().getIdentifier("navigation_bar_height", "dimen", "android");
+            int result = context.getResources().getDimensionPixelSize(resourceId);
+            promise.resolve(result);
+        } else {
+            promise.resolve(0);
+        }
+    }
 
-  public RNEasyuiModule(ReactApplicationContext reactContext) {
-    super(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/easyui/utils/ScreenUtil.java

@@ -0,0 +1,17 @@
+package com.easyui.utils;
+
+import android.content.Context;
+
+public class ScreenUtil {
+
+    public static int dp2px(Context context, float dp) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dp * scale + 0.5f);
+    }
+
+    public static int px2dp(Context context, float pxValue) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (pxValue / scale + 0.5f);
+    }
+
+}

package/jsbridge/RNEasyui.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 17:26:16
+ * @LastEditTime: 2022-05-31 18:42:45
  * @FilePath: /@aks-dev/easyui/jsbridge/RNEasyui.ts
  */
 
@@ -19,12 +19,12 @@ export const getStatusBarHeight = () => {
     const deviceHeight = Dimensions.get('window').height;
     const isiPhoneX = Platform.OS == 'ios' && (deviceHeight > 736)
     if (isiPhoneX) return Promise.resolve(44)
+    return Promise.resolve(20)
 }
 
 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)
+
+    return Promise.resolve(44)
+
 } 

package/jsbridge/index.ts

@@ -2,9 +2,9 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 17:00:25
+ * @LastEditTime: 2022-05-31 18:19:53
  * @FilePath: /@aks-dev/easyui/jsbridge/index.ts
- */ 
+ */
 
 
 /**
@@ -12,33 +12,34 @@
  * @param {*}
  * @return {*}
  */
- export declare const getAppVersion: () => 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>;
-
-
-
- /**
-  * @description: 获取status_bar_height
-  * @return {*}
-  */
- export declare const getStatusBarHeight:()=>Promise<number>;
-
- /**
-  * @description: 获取navigation_bar_height
-  * @return {*}
-  */
- export declare const getNavigationBarHeight:()=>Promise<number>;
+export declare const getAppVersion: () => 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>;
+
+/**
+ * @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.52",
+  "version": "1.0.55",
   "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:19:03
+ * @LastEditTime: 2022-05-31 18:34:57
  * @FilePath: /@aks-dev/easyui/screen/index.ts
  */
 export declare const deviceWidth: number;      //设备的宽度
@@ -19,7 +19,7 @@ export declare const isiPhoneX: boolean;
  */
 export declare const statusBarHeight: number;
 /**
- * @description: 顶部导航条的高度
+ * @description: 顶部导航条的高度,高度不包含statusBarHeight
  * @param {*}
  * @return {*}
  */

package/screen/init-fit.tsx

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-15 14:15:07
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 17:25:13
+ * @LastEditTime: 2022-05-31 18:22:50
  * @FilePath: /@aks-dev/easyui/screen/init-fit.tsx
  */
 /**
@@ -59,9 +59,4 @@ TextInput.defaultProps.allowFontScaling = false
 
 
 
-import * as RNEasyui from '../jsbridge/RNEasyui';
-
-
-export const statusBarHeight  = await RNEasyui.getStatusBarHeight()
-
-export const navigationBarHeight  = await RNEasyui.getNavigationBarHeight()
+import './px2dp'

package/screen/{px2dp.tsx → px2dp.ts}

@@ -2,10 +2,10 @@
  * @Author: shiguo
  * @Date: 2022-04-18 14:32:25
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-31 17:22:42
- * @FilePath: /@aks-dev/easyui/screen/px2dp.tsx
+ * @LastEditTime: 2022-05-31 18:43:44
+ * @FilePath: /@aks-dev/easyui/screen/px2dp.ts
  */
-import { Dimensions, Platform } from 'react-native';
+import { Dimensions, Platform, StatusBar } from 'react-native';
 
 
 // 设备宽度，单位 dp
@@ -35,19 +35,23 @@ export const px2dp = (uiElePx: number) => {
 
 
 
-// export const statusBarHeight = (() => {
-//     if (isAndroid) {
-//         if ((StatusBar.currentHeight || 0) > 20) return 40
-//     }
-//     if (isiPhoneX) return 44
-//     return 20
-// })()
+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 let navigationBarHeight = 44
+
+
+
+import * as RNEasyui from '../jsbridge/RNEasyui';
+; (async () => {
+    navigationBarHeight = await RNEasyui.getNavigationBarHeight();
+})()
+
 

package/src/index.ts

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