@aks-dev/easyui 1.0.50 → 1.0.51

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/jsbridge/RNEasyui.ts

@@ -0,0 +1,33 @@
+/*
+ * @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
+ */
+
+import { NativeModules, Platform, StatusBar, Dimensions } from 'react-native';
+
+const { RNEasyui } = NativeModules;
+
+
+
+
+
+
+
+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)
+}
+
+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.50",
+  "version": "1.0.51",
   "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:09:47
+ * @FilePath: /@aks-dev/easyui/screen/index.ts
  */
 export declare const deviceWidth: number;      //设备的宽度
 export declare const deviceHeight: number;      //设备的高度
@@ -13,12 +13,14 @@ 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/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;