@aks-dev/easyui 1.0.51 → 1.0.54

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,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/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.51",
+  "version": "1.0.54",
   "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 18:34:57
  * @FilePath: /@aks-dev/easyui/screen/index.ts
  */
 export declare const deviceWidth: number;      //设备的宽度
@@ -13,15 +13,13 @@ 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: 顶部导航条的高度
+ * @description: 顶部导航条的高度,高度不包含statusBarHeight
  * @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 18:22:50
+ * @FilePath: /@aks-dev/easyui/screen/init-fit.tsx
  */
 /**
  * 全局配置Text
@@ -55,4 +55,8 @@ 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 './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-16 17:46:40
- * @FilePath: /@aks/easyui/screen/px2dp.tsx
+ * @LastEditTime: 2022-05-31 18:34:36
+ * @FilePath: /@aks-dev/easyui/screen/px2dp.ts
  */
-import { Dimensions, StatusBar, Platform } from 'react-native';
+import { Dimensions, Platform, StatusBar } 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,8 +33,6 @@ export const px2dp = (uiElePx: number) => {
 
 
 
-export const isiPhoneX = isIos && (deviceHeight > 736)
-
 
 
 export const statusBarHeight = (() => {
@@ -44,8 +43,19 @@ export const statusBarHeight = (() => {
     return 20
 })()
 
-export const navigationBarHeight = (() => {
-    if (isAndroid) return statusBarHeight + 44
-    if (isiPhoneX) return 88
-    return 64
+
+
+export let navigationBarHeight = (() => {
+    if (isAndroid) return statusBarHeight
+    if (isiPhoneX) return 44
+    return 24
+})()
+
+
+
+import * as RNEasyui from '../jsbridge/RNEasyui';
+; (async () => {
+    navigationBarHeight = await RNEasyui.getNavigationBarHeight();
 })()
+
+

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 18:22:44
+ * @FilePath: /@aks-dev/easyui/src/index.ts
  */
 
 
@@ -54,7 +54,6 @@ export type { EchartsViewProps } from '../lib/Echarts'
 export * from '../screen/px2dp'
 export * from '../screen/px2sp'
 
-
 /// 工具
 import * as mode from '../utils/mode'
 import * as lazy from '../utils/lazy'