@aks-dev/easyui 1.1.7 → 1.2.1

package/android/build.gradle

@@ -1,51 +1,66 @@
-
 buildscript {
-    if (project == rootProject) {
-        repositories {
-            mavenCentral()
-            google()
-            ///https://blog.csdn.net/xiaopihair123/article/details/119422895
-            // maven{ url 'https://maven.aliyun.com/repository/google'}
-            // maven{ url 'https://maven.aliyun.com/repository/gradle-plugin'}
-            // maven{ url 'https://maven.aliyun.com/repository/public'}
-            // maven{ url 'https://maven.aliyun.com/repository/jcenter'}
-        }
-        
-        dependencies {
-            classpath("com.android.tools.build:gradle:4.2.2")
-        }
+    ext.safeExtGet = {prop, fallback ->
+        rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+    }
+    repositories {
+        google()
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet("kotlinVersion", "1.9.24")}")
+        classpath("com.android.tools.build:gradle:8.13.0")
     }
 }
 
-apply plugin: 'com.android.library'
-
-
+def isNewArchitectureEnabled() {
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
 
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+if (isNewArchitectureEnabled()) {
+    apply plugin: "com.facebook.react"
 }
 
-
 android {
-    compileSdkVersion safeExtGet('compileSdkVersion', 30)
+    namespace "com.easyui"
+
+    buildToolsVersion safeExtGet("buildToolsVersion", "35.0.0")
+    compileSdkVersion safeExtGet("compileSdkVersion", 35)
 
+    buildFeatures {
+        buildConfig true
+    }
     defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 21)
-        //noinspection OldTargetApi
-        targetSdkVersion safeExtGet('targetSdkVersion', 30)
+        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
+        minSdkVersion safeExtGet("minSdkVersion", 24)
+        targetSdkVersion safeExtGet("targetSdkVersion", 35)
     }
     lintOptions {
         abortOnError false
     }
+    sourceSets {
+        main {
+            if (isNewArchitectureEnabled()) {
+                java.srcDirs += ["src/newarch"]
+            } else {
+                java.srcDirs += ["src/oldarch"]
+            }
+        }
+    }
 }
 
 repositories {
+    maven {
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+        url("$rootDir/../node_modules/react-native/android")
+    }
+    google()
     mavenCentral()
 }
 
 dependencies {
-
-    implementation 'com.facebook.react:react-native:+'
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+" // From node_modules
 }
-  

package/android/src/main/java/com/easyui/{UpgradeModule.java → RNEasyuiModuleImpl.java}

@@ -1,10 +1,11 @@
 /*
  * @Author: shiguo
- * @Date: 2022-05-05 13:57:25
+ * @Date: 2022-04-25 17:57:29
  * @LastEditors: shiguo
- * @LastEditTime: 2023-02-16 16:52:19
- * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/UpgradeModule.java
+ * @LastEditTime: 2022-10-24 16:08:50
+ * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/RNEasyuiModule.java
  */
+
 package com.easyui;
 
 import android.Manifest;
@@ -14,6 +15,15 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.FileProvider;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
@@ -26,7 +36,6 @@ import android.os.Handler;
 import android.os.Looper;
 import android.os.PowerManager;
 import android.util.DisplayMetrics;
-import android.view.Display;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
@@ -34,18 +43,6 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.annotation.NonNull;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.FileProvider;
-
-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.ReadableMap;
-
-import org.w3c.dom.Text;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -55,9 +52,9 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.HashMap;
 
-public class UpgradeModule extends ReactContextBaseJavaModule {
-
-    private ReactApplicationContext context;
+public class RNEasyuiModuleImpl {
+    public static final String NAME = "RNEasyui";
+    private final ReactApplicationContext context;
     public static final int EXTERNAL_STORAGE_REQ_CODE = 10 ;
     private static Handler mHandler = new Handler(Looper.getMainLooper());
     private ProgressDialog mProgressDialog;
@@ -67,21 +64,66 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
     private static void runOnMainThread(Runnable runnable) {
         mHandler.postDelayed(runnable, 0);
     }
+    public RNEasyuiModuleImpl(ReactApplicationContext reactContext) {
+        context = reactContext;
+    }
 
-    @NonNull
-    @Override
     public String getName() {
-        return "UpgradeModule";
+        return NAME;
     }
 
 
-    public UpgradeModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.context = reactContext;
+    @ReactMethod
+    public void getDeviceBrand(Promise promise) {
+      promise.resolve( Build.BRAND+ Build.MODEL);
+    }
+
+    @Deprecated
+    @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);
+
+    }
+
+
+
 
+
+    @Deprecated
+    @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);
+        }
     }
 
 
+    @ReactMethod
+    public void gotoDesktop() {
+        //启动一个意图,回到桌面
+        Intent desktop = new Intent(Intent.ACTION_MAIN);
+        desktop.addCategory(Intent.CATEGORY_HOME);
+        ActivityCompat.startActivity(context.getCurrentActivity(), desktop, null);
+    }
+
     private String getAppVersionName() {
         try {
             PackageManager manager = context.getPackageManager();
@@ -261,7 +303,7 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
         //安装应用
         Intent intent = new Intent(Intent.ACTION_VIEW);
         //sg
-        ContextWrapper cw = new ContextWrapper(getReactApplicationContext());
+        ContextWrapper cw = new ContextWrapper(context);
         File directory = cw.getExternalFilesDir(Environment.DIRECTORY_MUSIC);
         Activity currentActivity = context.getCurrentActivity();
         //判断是否是AndroidN以及更高的版本
@@ -317,7 +359,7 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
 
                 mDownloadFile = "app_" + String.valueOf(System.currentTimeMillis()) + ".apk";
                 //sg
-                ContextWrapper cw = new ContextWrapper(getReactApplicationContext());
+                ContextWrapper cw = new ContextWrapper(context);
                 File directory = cw.getExternalFilesDir(Environment.DIRECTORY_MUSIC);
                 file = new File(directory, mDownloadFile);
                 //
@@ -394,4 +436,5 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
             }
         }
     }
-}
+
+}

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

@@ -8,31 +8,43 @@
 
 package com.easyui;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import com.facebook.react.ReactPackage;
+import com.facebook.react.BaseReactPackage;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-import com.facebook.react.bridge.JavaScriptModule;
-public class RNEasyuiPackage implements ReactPackage {
-    @Override
-    public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        List<NativeModule> modules = new ArrayList<>();
-        modules.add(new RNEasyuiModule(reactContext));
-        modules.add(new UpgradeModule(reactContext));
-        return modules;
-    }
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 
-    // Deprecated from RN 0.47
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-      return Collections.emptyList();
+import java.util.HashMap;
+import java.util.Map;
+
+public class RNEasyuiPackage extends BaseReactPackage {
+    @Nullable
+    @Override
+    public NativeModule getModule(@NonNull String s, @NonNull ReactApplicationContext reactApplicationContext) {
+        if (s.equals(RNEasyuiModuleImpl.NAME)) {
+            return new RNEasyuiModule(reactApplicationContext);
+        } else {
+            return null;
+        }
     }
 
+    @NonNull
     @Override
-    public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
-      return Collections.emptyList();
+    public ReactModuleInfoProvider getReactModuleInfoProvider() {
+        return ()->{
+            Map<String, ReactModuleInfo> map = new HashMap<>();
+            map.put(RNEasyuiModuleImpl.NAME, new ReactModuleInfo(
+                    RNEasyuiModuleImpl.NAME,       // name
+                    RNEasyuiModuleImpl.NAME,       // className
+                    false, // canOverrideExistingModule
+                    false, // needsEagerInit
+                    false, // isCXXModule
+                    true   // isTurboModule
+            ));
+            return map;
+        };
     }
 }

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

@@ -0,0 +1,76 @@
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-25 17:57:29
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-10-24 16:08:50
+ * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/RNEasyuiModule.java
+ */
+
+package com.easyui;
+
+
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
+
+@ReactModule(name = RNEasyuiModuleImpl.NAME)
+public class RNEasyuiModule extends  NativeRNEasyuiSpec{
+    final private RNEasyuiModuleImpl mRNEasyuiModuleImpl;
+
+    public RNEasyuiModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        mRNEasyuiModuleImpl = new RNEasyuiModuleImpl(reactContext);
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return RNEasyuiModuleImpl.NAME;
+    }
+
+
+   @Override
+    public void getDeviceBrand(Promise promise) {
+       mRNEasyuiModuleImpl.getDeviceBrand(promise);
+    }
+
+    @Deprecated
+    public void getStatusBarHeight(final Promise promise) {
+        mRNEasyuiModuleImpl.getStatusBarHeight(promise);
+    }
+
+
+
+
+
+    @Deprecated
+    public void getNavigationBarHeight(final Promise promise) {
+        mRNEasyuiModuleImpl.getNavigationBarHeight(promise);
+    }
+
+
+    @Override
+    public void gotoDesktop() {
+        mRNEasyuiModuleImpl.gotoDesktop();
+    }
+
+
+   @Override
+    public void getAppVersion(final Promise promise) {
+       mRNEasyuiModuleImpl.getAppVersion(promise);
+    }
+
+    @Override
+    public void getOSVersion(Promise promise) {
+        mRNEasyuiModuleImpl.getOSVersion(promise);
+    }
+
+    @Override
+    public void upgrade(final ReadableMap info, final Promise promise) {
+        mRNEasyuiModuleImpl.upgrade(info, promise);
+    }
+}

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

@@ -0,0 +1,79 @@
+/*
+ * @Author: shiguo
+ * @Date: 2022-04-25 17:57:29
+ * @LastEditors: shiguo
+ * @LastEditTime: 2022-10-24 16:08:50
+ * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/RNEasyuiModule.java
+ */
+
+package com.easyui;
+
+
+
+import androidx.annotation.NonNull;
+
+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.ReadableMap;
+import com.facebook.react.module.annotations.ReactModule;
+
+@ReactModule(name = RNEasyuiModuleImpl.NAME)
+public class RNEasyuiModule extends ReactContextBaseJavaModule {
+    final private RNEasyuiModuleImpl mRNEasyuiModuleImpl;
+
+    public RNEasyuiModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        mRNEasyuiModuleImpl = new RNEasyuiModuleImpl(reactContext);
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return RNEasyuiModuleImpl.NAME;
+    }
+
+
+    @ReactMethod
+    public void getDeviceBrand(Promise promise) {
+       mRNEasyuiModuleImpl.getDeviceBrand(promise);
+    }
+
+    @Deprecated
+    @ReactMethod
+    public void getStatusBarHeight(final Promise promise) {
+        mRNEasyuiModuleImpl.getStatusBarHeight(promise);
+    }
+
+
+
+
+    @Deprecated
+    @ReactMethod
+    public void getNavigationBarHeight(final Promise promise) {
+        mRNEasyuiModuleImpl.getNavigationBarHeight(promise);
+    }
+
+
+    @ReactMethod
+    public void gotoDesktop() {
+        mRNEasyuiModuleImpl.gotoDesktop();
+    }
+
+
+    @ReactMethod
+    public void getAppVersion(final Promise promise) {
+       mRNEasyuiModuleImpl.getAppVersion(promise);
+    }
+
+    @ReactMethod
+    public void getOSVersion(Promise promise) {
+        mRNEasyuiModuleImpl.getOSVersion(promise);
+    }
+
+    @ReactMethod
+    public void upgrade(final ReadableMap info, final Promise promise) {
+        mRNEasyuiModuleImpl.upgrade(info, promise);
+    }
+}

package/dist/components/MutiPictureView/MutiPictureView.js

@@ -9,6 +9,7 @@ import * as React from "react";
 import { Image, View, StyleSheet, Keyboard, TouchableOpacity, Text, } from "react-native";
 import { px2dp } from "../../screen/px2dp";
 import { px2sp } from "../../screen/px2sp";
+import SYImagePicker from "@aks-dev/react-native-syan-image-picker";
 let icon_add_image = require("./assets/icon_add_image.png");
 let icon_del_image = require("./assets/icon_del_image.png");
 const MutiPictureView = (props) => {
@@ -22,46 +23,41 @@ const MutiPictureView = (props) => {
         if (!images) {
             throw new Error("viewModel没有定义photos字段");
         }
-        // if (type == "showImagePicker") {
-        //   SYImagePicker.showImagePicker(
-        //     {
-        //       imageCount: maxCount - (viewModel.photos?.length || 0),
-        //       isCrop: false,
-        //       isRecordSelected: false,
-        //       quality: 20,
-        //     },
-        //     (err, photos) => {
-        //       if (!err) {
-        //         let imgs = photos.map((it) => {
-        //           return { uri: it.uri };
-        //         });
-        //         images = images.concat(imgs);
-        //         setViewModel({ photos: images });
-        //       }
-        //     },
-        //   );
-        // }
-        // if (type == "openCamera") {
-        //   SYImagePicker.openCamera(
-        //     {
-        //       imageCount: maxCount - (viewModel.photos?.length || 0),
-        //       isCrop: false,
-        //       isRecordSelected: false,
-        //       quality: 20,
-        //     },
-        //     (err, photos) => {
-        //       if (!err) {
-        //         let imgs = photos.map((it) => {
-        //           return { uri: it.uri };
-        //         });
-        //         images = images.concat(imgs);
-        //         setViewModel({ photos: images });
-        //       } else {
-        //         console.log("打开相机失败");
-        //       }
-        //     },
-        //   );
-        // }
+        if (type == "showImagePicker") {
+            SYImagePicker.showImagePicker({
+                imageCount: maxCount - (viewModel.photos?.length || 0),
+                isCrop: false,
+                isRecordSelected: false,
+                quality: 20,
+            }, (err, photos) => {
+                if (!err) {
+                    let imgs = photos.map((it) => {
+                        return { uri: it.uri };
+                    });
+                    images = images.concat(imgs);
+                    setViewModel({ photos: images });
+                }
+            });
+        }
+        if (type == "openCamera") {
+            SYImagePicker.openCamera({
+                imageCount: maxCount - (viewModel.photos?.length || 0),
+                isCrop: false,
+                isRecordSelected: false,
+                quality: 20,
+            }, (err, photos) => {
+                if (!err) {
+                    let imgs = photos.map((it) => {
+                        return { uri: it.uri };
+                    });
+                    images = images.concat(imgs);
+                    setViewModel({ photos: images });
+                }
+                else {
+                    console.log("打开相机失败");
+                }
+            });
+        }
     };
     const deletePhoto = (index) => {
         Keyboard.dismiss();

package/dist/index.d.ts

@@ -17,6 +17,6 @@ export * from "./screen";
 /**工具 */
 import * as utils from "./utils";
 /**桥接 */
-import * as jsbridge from "./jsbridge";
+import * as jsbridge from "./jsbridge/RNEasyui";
 export { utils, jsbridge };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,GAAG,EACH,WAAW,EACX,WAAW,EACX,SAAS,EACT,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,WAAW,EACX,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,YAAY,EACZ,WAAW,GACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EACL,OAAO,IAAI,oBAAoB,EAC/B,MAAM,GACP,MAAM,wDAAwD,CAAC;AAEhE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,UAAU;AACV,cAAc,UAAU,CAAC;AACzB,QAAQ;AACR,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,QAAQ;AACR,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,GAAG,EACH,WAAW,EACX,WAAW,EACX,SAAS,EACT,cAAc,EACd,oBAAoB,EACpB,mBAAmB,EACnB,eAAe,EACf,eAAe,EACf,WAAW,EACX,WAAW,GACZ,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,YAAY,EACZ,WAAW,GACZ,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EACL,OAAO,IAAI,oBAAoB,EAC/B,MAAM,GACP,MAAM,wDAAwD,CAAC;AAEhE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC1F,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,UAAU;AACV,cAAc,UAAU,CAAC;AACzB,QAAQ;AACR,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,QAAQ;AACR,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC"}

package/dist/index.js

@@ -28,5 +28,5 @@ export * from "./screen";
 /**工具 */
 import * as utils from "./utils";
 /**桥接 */
-import * as jsbridge from "./jsbridge";
+import * as jsbridge from "./jsbridge/RNEasyui";
 export { utils, jsbridge };

package/dist/jsbridge/RNEasyui.d.ts

@@ -2,22 +2,47 @@
  * @description: 获取设备品牌
  * @return {*}
  */
-export declare const getDeviceBrand: () => any;
+export declare const getDeviceBrand: () => Promise<string>;
 /**
  * @deprecated 测量不准确，已放弃
  * @description: 获取status_bar_height
  * @return {*}
  */
-export declare const getStatusBarHeight: () => any;
+export declare const getStatusBarHeight: () => Promise<number>;
 /**
  * @deprecated 测量不准确，已放弃
  * @description: 获取navigation_bar_height
  * @return {*}
  */
-export declare const getNavigationBarHeight: () => any;
+export declare const getNavigationBarHeight: () => Promise<number>;
 /**
  * only android
  * 返回桌面
  */
 export declare const gotoDesktop: () => void;
+/**
+ * @description: 获取App版本号
+ * @param {*}
+ * @return {*}
+ */
+export declare const getAppVersion: () => Promise<string>;
+/**
+ * @description: 获取操作系统版本
+ *
+ react-native-device-info
+ * @return {*}
+ */
+export declare const getOSVersion: () => Promise<string>;
+/**
+ * @description: app升级
+ * @return {*}
+ */
+export type UpgradeOptions = {
+    title?: string;
+    version: string;
+    downloadUrl: string;
+    note: string;
+    force: boolean;
+};
+export declare const upgrade: (options: UpgradeOptions) => Promise<string>;
 //# sourceMappingURL=RNEasyui.d.ts.map

package/dist/jsbridge/RNEasyui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RNEasyui.d.ts","sourceRoot":"","sources":["../../src/jsbridge/RNEasyui.ts"],"names":[],"mappings":"AAYA;;;GAGG;AACH,eAAO,MAAM,cAAc,WAAkC,CAAC;AAC9D;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,WAO9B,CAAC;AACF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,WAIlC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,YAEvB,CAAC"}
+{"version":3,"file":"RNEasyui.d.ts","sourceRoot":"","sources":["../../src/jsbridge/RNEasyui.ts"],"names":[],"mappings":"AAiBA;;;GAGG;AACH,eAAO,MAAM,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,CACtB,CAAC;AAC5B;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,EAAE,MAAM,OAAO,CAAC,MAAM,CAOpD,CAAC;AACF;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,MAAM,OAAO,CAAC,MAAM,CAIxD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,MAAM,IAE/B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,MAAM,OAAO,CAAC,MAAM,CACtB,CAAC;AAC3B;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CACtB,CAAC;AAC1B;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CA4BhE,CAAC"}

package/dist/jsbridge/RNEasyui.js

@@ -5,7 +5,7 @@
  * @LastEditTime: 2023-03-10 14:05:17
  * @FilePath: /@aks-dev/easyui/jsbridge/RNEasyui.ts
  */
-import { Dimensions, NativeModules, Platform } from "react-native";
+import { Dimensions, NativeModules, Platform, PermissionsAndroid, } from "react-native";
 const { RNEasyui } = NativeModules;
 /**
  * @description: 获取设备品牌
@@ -44,3 +44,38 @@ export const gotoDesktop = () => {
     if (Platform.OS == "android")
         RNEasyui?.gotoDesktop();
 };
+/**
+ * @description: 获取App版本号
+ * @param {*}
+ * @return {*}
+ */
+export const getAppVersion = () => RNEasyui.getAppVersion();
+/**
+ * @description: 获取操作系统版本
+ *
+ react-native-device-info
+ * @return {*}
+ */
+export const getOSVersion = () => RNEasyui.getOSVersion();
+export const upgrade = async (options) => {
+    const { title = "提示" } = options;
+    if (Platform.OS == "android") {
+        try {
+            const granted = await PermissionsAndroid.request(PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE, {
+                title: "提示",
+                message: "应用升级需要获取APP的写入权限",
+                buttonNeutral: "稍后再询问",
+                buttonNegative: "取消",
+                buttonPositive: "确定",
+            });
+            if (granted === PermissionsAndroid.RESULTS.GRANTED) {
+                return RNEasyui.upgrade(options);
+            }
+            return Promise.reject("没有应用升级权限！");
+        }
+        catch (err) {
+            return Promise.reject("请求权限异常！");
+        }
+    }
+    return RNEasyui.upgrade(options);
+};

package/dist/jsbridge/UpgradeModule.d.ts

@@ -3,14 +3,14 @@
  * @param {*}
  * @return {*}
  */
-export declare const getAppVersion: () => any;
+export declare const getAppVersion: () => Promise<string>;
 /**
  * @description: 获取操作系统版本
  *
  react-native-device-info
  * @return {*}
  */
-export declare const getOSVersion: () => any;
+export declare const getOSVersion: () => Promise<string>;
 /**
  * @description: app升级
  * @return {*}
@@ -22,5 +22,5 @@ export type UpgradeOptions = {
     note: string;
     force: boolean;
 };
-export declare const upgrade: (options: UpgradeOptions) => Promise<any>;
+export declare const upgrade: (options: UpgradeOptions) => Promise<string>;
 //# sourceMappingURL=UpgradeModule.d.ts.map

package/dist/jsbridge/UpgradeModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UpgradeModule.d.ts","sourceRoot":"","sources":["../../src/jsbridge/UpgradeModule.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,eAAO,MAAM,aAAa,WAAsC,CAAC;AACjE;;;;;GAKG;AACH,eAAO,MAAM,YAAY,WAAqC,CAAC;AAC/D;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,OAAO,GAAU,SAAS,cAAc,iBA0BpD,CAAC"}
+{"version":3,"file":"UpgradeModule.d.ts","sourceRoot":"","sources":["../../src/jsbridge/UpgradeModule.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,MAAM,OAAO,CAAC,MAAM,CACjB,CAAC;AAChC;;;;;GAKG;AACH,eAAO,MAAM,YAAY,EAAE,MAAM,OAAO,CAAC,MAAM,CACjB,CAAC;AAC/B;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CA4BhE,CAAC"}

package/dist/specs/NativeRNEasyui.d.ts

@@ -0,0 +1,18 @@
+import type { TurboModule } from 'react-native';
+type UpgradeOptions = {
+    title?: string;
+    version: string;
+    downloadUrl: string;
+    note: string;
+    force: boolean;
+};
+export interface Spec extends TurboModule {
+    getAppVersion(): Promise<string>;
+    getOSVersion(): Promise<string>;
+    getDeviceBrand(): Promise<string>;
+    gotoDesktop(): void;
+    upgrade: (options: UpgradeOptions) => Promise<string>;
+}
+declare const _default: Spec;
+export default _default;
+//# sourceMappingURL=NativeRNEasyui.d.ts.map

package/dist/specs/NativeRNEasyui.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"NativeRNEasyui.d.ts","sourceRoot":"","sources":["../../src/specs/NativeRNEasyui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,KAAK,cAAc,GAAG;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;CAClB,CAAC;AACF,MAAM,WAAW,IAAK,SAAQ,WAAW;IACrC,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACjC,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAClC,WAAW,IAAG,IAAI,CAAC;IACnB,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CACxD;wBAII,IAAI;AAFT,wBAEU"}

package/dist/specs/NativeRNEasyui.js

@@ -0,0 +1,2 @@
+import { TurboModuleRegistry } from 'react-native';
+export default TurboModuleRegistry.getEnforcing('RNEasyui');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.1.7",
+  "version": "1.2.1",
   "description": "工具箱",
   "exports": {
     ".": {
@@ -36,7 +36,8 @@
     "!/tsconfig.md",
     "!/i.sh",
     "!/src/**/assets/*",
-    "!/docs"
+    "!/docs",
+    "/src/specs"
   ],
   "homepage": "https://gitee.com/the_period_of_the_ten_kingdoms",
   "repository": {
@@ -50,11 +51,13 @@
     "react-native": "*",
     "react-native-permissions": "*",
     "react-native-vision-camera": "*",
-    "react-native-webview": "*"
+    "react-native-webview": "*",
+    "@aks-dev/react-native-syan-image-picker": "*"
   },
   "dependencies": {
     "echarts": "^6.0.0",
     "react-native-image-zoom-viewer": "^3.0.1",
+    "react-native-modal": "^14.0.0-rc.1",
     "react-native-smart-refresh": "^1.1.6",
     "react-native-swipe-list-view": "^3.2.9"
   },
@@ -64,12 +67,21 @@
     "react-native": "^0.84.1",
     "react-native-permissions": "^5.5.1",
     "react-native-vision-camera": "^4.7.3",
-    "react-native-webview": "^13.16.1"
+    "react-native-webview": "^13.16.1",
+    "@aks-dev/react-native-syan-image-picker": "^1.0.1"
   },
   "resolutions": {
     "@types/react": "*"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
+  },
+  "codegenConfig": {
+    "name": "RNEasyuiSpec",
+    "type": "modules",
+    "jsSrcsDir": "./src/specs",
+    "android": {
+      "javaPackageName": "com.easyui"
+    }
   }
 }

package/src/specs/NativeRNEasyui.ts

@@ -0,0 +1,20 @@
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+type UpgradeOptions = {
+    title?: string;
+    version: string;
+    downloadUrl: string;
+    note: string;
+    force: boolean;
+};
+export interface Spec extends TurboModule {
+    getAppVersion(): Promise<string>;
+    getOSVersion(): Promise<string>;
+    getDeviceBrand(): Promise<string>;
+    gotoDesktop():void;
+    upgrade: (options: UpgradeOptions) => Promise<string>
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>(
+  'RNEasyui',
+) as Spec;

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

@@ -1,86 +0,0 @@
-/*
- * @Author: shiguo
- * @Date: 2022-04-25 17:57:29
- * @LastEditors: shiguo
- * @LastEditTime: 2022-10-24 16:08:50
- * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/RNEasyuiModule.java
- */
-
-package com.easyui;
-
-import android.content.Intent;
-
-import androidx.core.app.ActivityCompat;
-
-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 {
-
-    private final ReactApplicationContext context;
-
-    public RNEasyuiModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        this.context = reactContext;
-    }
-
-    @Override
-    public String getName() {
-        return "RNEasyui";
-    }
-
-
-    @ReactMethod
-    public void getDeviceBrand(Promise promise) {
-      promise.resolve( Build.BRAND+ Build.MODEL);
-    }
-
-    @Deprecated
-    @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);
-
-    }
-
-
-
-
-
-    @Deprecated
-    @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);
-        }
-    }
-
-
-    @ReactMethod
-    public void gotoDesktop() {
-        //启动一个意图,回到桌面
-        Intent desktop = new Intent(Intent.ACTION_MAIN);
-        desktop.addCategory(Intent.CATEGORY_HOME);
-        ActivityCompat.startActivity(getCurrentActivity(), desktop, null);
-    }
-}