@aks-dev/easyui 1.0.106 → 1.0.108

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-07-07 10:40:51
+ * @LastEditTime: 2022-10-24 16:08:50
  * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/RNEasyuiModule.java
  */
 
@@ -16,6 +16,7 @@ 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 android.os.Build;
 
 public class RNEasyuiModule extends ReactContextBaseJavaModule {
 
@@ -32,6 +33,11 @@ public class RNEasyuiModule extends ReactContextBaseJavaModule {
     }
 
 
+    @ReactMethod
+    public void getDeviceBrand(Promise promise) {
+      promise.resolve( Build.BRAND+ Build.MODEL);
+    }
+
     @Deprecated
     @ReactMethod
     public void getStatusBarHeight(final Promise promise) {
@@ -48,6 +54,9 @@ public class RNEasyuiModule extends ReactContextBaseJavaModule {
     }
 
 
+
+
+
     @Deprecated
     @ReactMethod
     public void getNavigationBarHeight(final Promise promise) {

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

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-05-05 13:57:25
  * @LastEditors: shiguo
- * @LastEditTime: 2022-06-08 10:55:21
+ * @LastEditTime: 2022-10-24 16:07:27
  * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/UpgradeModule.java
  */
 package com.easyui;
@@ -100,6 +100,11 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
         promise.resolve(this.getAppVersionName());
     }
 
+    @ReactMethod
+    public void getOSVersion(Promise promise) {
+        promise.resolve(android.os.Build.VERSION.RELEASE);
+    }
+
 
     @ReactMethod
     public void upgrade(final ReadableMap info, final Promise promise) {

package/ios/RNEasyui.m

@@ -1,5 +1,6 @@
 
 #import "RNEasyui.h"
+#import "RomUtil.h"
 
 @implementation RNEasyui
 
@@ -9,5 +10,11 @@
 }
 RCT_EXPORT_MODULE()
 
+RCT_EXPORT_METHOD(getDeviceBrand:(RCTPromiseResolveBlock)resolve
+                          reject:(RCTPromiseRejectBlock)reject){
+      resolve([RomUtil getCurrentDeviceModel]);
+}
+
+
 @end
   

package/jsbridge/RNEasyui.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-07 10:41:19
+ * @LastEditTime: 2022-10-24 16:14:40
  * @FilePath: /@aks-dev/easyui/jsbridge/RNEasyui.ts
  */
 
@@ -12,6 +12,9 @@ const { RNEasyui } = NativeModules;
 
 
 
+export const getDeviceBrand = () => RNEasyui.getDeviceBrand();
+
+
 
 export const getStatusBarHeight = () => {
     if (Platform.OS == 'android') return RNEasyui.getStatusBarHeight();

package/jsbridge/UpgradeModule.ts

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-05-05 14:19:39
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-24 14:08:49
- * @FilePath: /@aks-dev/easyui/jsbridge/UpgradeModule.tsx
+ * @LastEditTime: 2022-10-24 16:13:01
+ * @FilePath: /@aks-dev/easyui/jsbridge/UpgradeModule.ts
  */
 import { NativeModules, PermissionsAndroid, Platform } from 'react-native';
 
@@ -13,6 +13,7 @@ import type { UpgradeOptions } from '.'
 
 export const getAppVersion = () => UpgradeModule.getAppVersion();
 
+export const getOSVersion = () => UpgradeModule.getOSVersion();
 
 export const upgrade = async (options: UpgradeOptions ) => {
     const { title = '提示' } = options

package/jsbridge/index.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-07 10:41:01
+ * @LastEditTime: 2022-10-24 16:38:59
  * @FilePath: /@aks-dev/easyui/jsbridge/index.ts
  */
 
@@ -14,6 +14,20 @@
  */
 export declare const getAppVersion: () => Promise<string>;
 
+/**
+ * @description: 获取操作系统版本
+ * 
+ react-native-device-info
+ * @return {*}
+ */
+export declare const getOSVersion: () => Promise<string>;
+
+/**
+ * @description: 获取设备品牌
+ * @return {*}
+ */
+export declare const getDeviceBrand: () => Promise<string>;
+
 
 export declare type UpgradeOptions = {
     title?: string;

package/lib/TableCell/TableCell.tsx

@@ -13,7 +13,7 @@ import { TableCellProps } from './index'
 export default (props: Partial<TableCellProps>) => {
     const { showNav = false, activeOpacity = .8 } = props
     return (
-        <TouchableOpacity activeOpacity={activeOpacity}
+        <TouchableOpacity activeOpacity={props.onPress == undefined ? activeOpacity : 1}
             style={[styles.container, props.style]}
             disabled={props.onPress == undefined}
             onPress={() => props.onPress && props.onPress()}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.106",
+  "version": "1.0.108",
   "description": "工具箱",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",