@aks-dev/easyui 1.0.48 → 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/android/src/main/java/com/easyui/utils/RomUtil.java

@@ -0,0 +1,124 @@
+package com.easyui.utils;
+
+import android.os.Build;
+import android.text.TextUtils;
+import android.util.Log;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class RomUtil {
+    private static final String TAG = "RomUtil";
+
+    public static final String ROM_MIUI = "MIUI";
+    public static final String ROM_EMUI = "EMUI";
+    public static final String ROM_FLYME = "FLYME";
+    public static final String ROM_OPPO = "OPPO";
+    public static final String ROM_SMARTISAN = "SMARTISAN";
+    public static final String ROM_VIVO = "VIVO";
+    public static final String ROM_QIKU = "QIKU";
+
+    private static final String KEY_VERSION_MIUI = "ro.miui.ui.version.name";
+    private static final String KEY_VERSION_EMUI = "ro.build.version.emui";
+    private static final String KEY_VERSION_OPPO = "ro.build.version.opporom";
+    private static final String KEY_VERSION_SMARTISAN = "ro.smartisan.version";
+    private static final String KEY_VERSION_VIVO = "ro.vivo.os.version";
+
+    private static String sName;
+    private static String sVersion;
+
+    /** 华为 */
+    public static boolean isEmui() {
+        return check(ROM_EMUI);
+    }
+    /** 小米 */
+    public static boolean isMiui() {
+        return check(ROM_MIUI);
+    }
+    /** vivo */
+    public static boolean isVivo() {
+        return check(ROM_VIVO);
+    }
+    /** oppo */
+    public static boolean isOppo() {
+        return check(ROM_OPPO);
+    }
+    /** 魅族 */
+    public static boolean isFlyme() {
+        return check(ROM_FLYME);
+    }
+    /** 360 */
+    public static boolean is360() {
+        return check(ROM_QIKU) || check("360");
+    }
+
+    public static boolean isSmartisan() {
+        return check(ROM_SMARTISAN);
+    }
+
+    public static String getName() {
+        if (sName == null) {
+            check("");
+        }
+        return sName;
+    }
+
+    public static String getVersion() {
+        if (sVersion == null) {
+            check("");
+        }
+        return sVersion;
+    }
+
+    public static boolean check(String rom) {
+        if (sName != null) {
+            return sName.equals(rom);
+        }
+
+        if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_MIUI))) {
+            sName = ROM_MIUI;
+        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_EMUI))) {
+            sName = ROM_EMUI;
+        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_OPPO))) {
+            sName = ROM_OPPO;
+        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_VIVO))) {
+            sName = ROM_VIVO;
+        } else if (!TextUtils.isEmpty(sVersion = getProp(KEY_VERSION_SMARTISAN))) {
+            sName = ROM_SMARTISAN;
+        } else {
+            sVersion = Build.DISPLAY;
+            if (sVersion.toUpperCase().contains(ROM_FLYME)) {
+                sName = ROM_FLYME;
+            } else {
+                sVersion = Build.UNKNOWN;
+                sName = Build.MANUFACTURER.toUpperCase();
+            }
+        }
+        return sName.equals(rom);
+    }
+
+    public static String getProp(String name) {
+        String line = null;
+        BufferedReader input = null;
+        try {
+            Process p = Runtime.getRuntime().exec("getprop " + name);
+            input = new BufferedReader(new InputStreamReader(p.getInputStream()), 1024);
+            line = input.readLine();
+            input.close();
+        } catch (IOException ex) {
+            Log.e(TAG, "Unable to read prop " + name, ex);
+            return null;
+        } finally {
+            if (input != null) {
+                try {
+                    input.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return line;
+    }
+
+}

package/ios/utils/RomUtil.h

@@ -0,0 +1,16 @@
+//
+//  RomUtil.h
+//  officeServiceApp
+//
+//  Created by mac on 2021/1/19.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RomUtil : NSObject
++ (NSString *)getCurrentDeviceModel;
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/utils/RomUtil.m

@@ -0,0 +1,104 @@
+//
+//  RomUtil.m
+//  officeServiceApp
+//
+//  Created by mac on 2021/1/19.
+//
+
+#import "RomUtil.h"
+#import <sys/utsname.h>//要导入头文件
+@implementation RomUtil
+
+
++ (NSString *)getCurrentDeviceModel{
+   struct utsname systemInfo;
+   uname(&systemInfo);
+   
+   NSString *deviceModel = [NSString stringWithCString:systemInfo.machine encoding:NSASCIIStringEncoding];
+   
+   
+if ([deviceModel isEqualToString:@"iPhone3,1"])    return @"iPhone 4";
+if ([deviceModel isEqualToString:@"iPhone3,2"])    return @"iPhone 4";
+if ([deviceModel isEqualToString:@"iPhone3,3"])    return @"iPhone 4";
+if ([deviceModel isEqualToString:@"iPhone4,1"])    return @"iPhone 4S";
+if ([deviceModel isEqualToString:@"iPhone5,1"])    return @"iPhone 5";
+if ([deviceModel isEqualToString:@"iPhone5,2"])    return @"iPhone 5 (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPhone5,3"])    return @"iPhone 5c (GSM)";
+if ([deviceModel isEqualToString:@"iPhone5,4"])    return @"iPhone 5c (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPhone6,1"])    return @"iPhone 5s (GSM)";
+if ([deviceModel isEqualToString:@"iPhone6,2"])    return @"iPhone 5s (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPhone7,1"])    return @"iPhone 6 Plus";
+if ([deviceModel isEqualToString:@"iPhone7,2"])    return @"iPhone 6";
+if ([deviceModel isEqualToString:@"iPhone8,1"])    return @"iPhone 6s";
+if ([deviceModel isEqualToString:@"iPhone8,2"])    return @"iPhone 6s Plus";
+if ([deviceModel isEqualToString:@"iPhone8,4"])    return @"iPhone SE";
+// 日行两款手机型号均为日本独占，可能使用索尼FeliCa支付方案而不是苹果支付
+if ([deviceModel isEqualToString:@"iPhone9,1"])    return @"iPhone 7";
+if ([deviceModel isEqualToString:@"iPhone9,2"])    return @"iPhone 7 Plus";
+if ([deviceModel isEqualToString:@"iPhone9,3"])    return @"iPhone 7";
+if ([deviceModel isEqualToString:@"iPhone9,4"])    return @"iPhone 7 Plus";
+if ([deviceModel isEqualToString:@"iPhone10,1"])   return @"iPhone_8";
+if ([deviceModel isEqualToString:@"iPhone10,4"])   return @"iPhone_8";
+if ([deviceModel isEqualToString:@"iPhone10,2"])   return @"iPhone_8_Plus";
+if ([deviceModel isEqualToString:@"iPhone10,5"])   return @"iPhone_8_Plus";
+if ([deviceModel isEqualToString:@"iPhone10,3"])   return @"iPhone X";
+if ([deviceModel isEqualToString:@"iPhone10,6"])   return @"iPhone X";
+if ([deviceModel isEqualToString:@"iPhone11,8"])   return @"iPhone XR";
+if ([deviceModel isEqualToString:@"iPhone11,2"])   return @"iPhone XS";
+if ([deviceModel isEqualToString:@"iPhone11,6"])   return @"iPhone XS Max";
+if ([deviceModel isEqualToString:@"iPhone11,4"])   return @"iPhone XS Max";
+if ([deviceModel isEqualToString:@"iPhone12,1"])   return @"iPhone 11";
+if ([deviceModel isEqualToString:@"iPhone12,3"])   return @"iPhone 11 Pro";
+if ([deviceModel isEqualToString:@"iPhone12,5"])   return @"iPhone 11 Pro Max";
+if ([deviceModel isEqualToString:@"iPhone12,8"])   return @"iPhone SE2";
+if ([deviceModel isEqualToString:@"iPhone13,1"])   return @"iPhone 12 mini";
+if ([deviceModel isEqualToString:@"iPhone13,2"])   return @"iPhone 12";
+if ([deviceModel isEqualToString:@"iPhone13,3"])   return @"iPhone 12 Pro";
+if ([deviceModel isEqualToString:@"iPhone13,4"])   return @"iPhone 12 Pro Max";
+if ([deviceModel isEqualToString:@"iPod1,1"])      return @"iPod Touch 1G";
+if ([deviceModel isEqualToString:@"iPod2,1"])      return @"iPod Touch 2G";
+if ([deviceModel isEqualToString:@"iPod3,1"])      return @"iPod Touch 3G";
+if ([deviceModel isEqualToString:@"iPod4,1"])      return @"iPod Touch 4G";
+if ([deviceModel isEqualToString:@"iPod5,1"])      return @"iPod Touch (5 Gen)";
+if ([deviceModel isEqualToString:@"iPad1,1"])      return @"iPad";
+if ([deviceModel isEqualToString:@"iPad1,2"])      return @"iPad 3G";
+if ([deviceModel isEqualToString:@"iPad2,1"])      return @"iPad 2 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad2,2"])      return @"iPad 2";
+if ([deviceModel isEqualToString:@"iPad2,3"])      return @"iPad 2 (CDMA)";
+if ([deviceModel isEqualToString:@"iPad2,4"])      return @"iPad 2";
+if ([deviceModel isEqualToString:@"iPad2,5"])      return @"iPad Mini (WiFi)";
+if ([deviceModel isEqualToString:@"iPad2,6"])      return @"iPad Mini";
+if ([deviceModel isEqualToString:@"iPad2,7"])      return @"iPad Mini (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPad3,1"])      return @"iPad 3 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad3,2"])      return @"iPad 3 (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPad3,3"])      return @"iPad 3";
+if ([deviceModel isEqualToString:@"iPad3,4"])      return @"iPad 4 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad3,5"])      return @"iPad 4";
+if ([deviceModel isEqualToString:@"iPad3,6"])      return @"iPad 4 (GSM+CDMA)";
+if ([deviceModel isEqualToString:@"iPad4,1"])      return @"iPad Air (WiFi)";
+if ([deviceModel isEqualToString:@"iPad4,2"])      return @"iPad Air (Cellular)";
+if ([deviceModel isEqualToString:@"iPad4,4"])      return @"iPad Mini 2 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad4,5"])      return @"iPad Mini 2 (Cellular)";
+if ([deviceModel isEqualToString:@"iPad4,6"])      return @"iPad Mini 2";
+if ([deviceModel isEqualToString:@"iPad4,7"])      return @"iPad Mini 3";
+if ([deviceModel isEqualToString:@"iPad4,8"])      return @"iPad Mini 3";
+if ([deviceModel isEqualToString:@"iPad4,9"])      return @"iPad Mini 3";
+if ([deviceModel isEqualToString:@"iPad5,1"])      return @"iPad Mini 4 (WiFi)";
+if ([deviceModel isEqualToString:@"iPad5,2"])      return @"iPad Mini 4 (LTE)";
+if ([deviceModel isEqualToString:@"iPad5,3"])      return @"iPad Air 2";
+if ([deviceModel isEqualToString:@"iPad5,4"])      return @"iPad Air 2";
+if ([deviceModel isEqualToString:@"iPad6,3"])      return @"iPad Pro 9.7";
+if ([deviceModel isEqualToString:@"iPad6,4"])      return @"iPad Pro 9.7";
+if ([deviceModel isEqualToString:@"iPad6,7"])      return @"iPad Pro 12.9";
+if ([deviceModel isEqualToString:@"iPad6,8"])      return @"iPad Pro 12.9";
+
+if ([deviceModel isEqualToString:@"AppleTV2,1"])      return @"Apple TV 2";
+if ([deviceModel isEqualToString:@"AppleTV3,1"])      return @"Apple TV 3";
+if ([deviceModel isEqualToString:@"AppleTV3,2"])      return @"Apple TV 3";
+if ([deviceModel isEqualToString:@"AppleTV5,3"])      return @"Apple TV 4";
+
+if ([deviceModel isEqualToString:@"i386"])         return @"Simulator";
+if ([deviceModel isEqualToString:@"x86_64"])       return @"Simulator";
+    return deviceModel;
+}
+@end

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.48",
+  "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;