@aks-dev/easyui 1.1.5 → 1.2.0

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/AnimationModal/AnimationModal.d.ts

@@ -16,12 +16,11 @@ export type AnimationModalProps = {
         backgroundColor?: ColorValue | undefined;
     };
 };
-type RefAttributes = {
-    show: () => RefAttributes;
-    hide: () => RefAttributes;
-    setData: (data?: any) => RefAttributes;
+export type AnimationModalRefAttributes = {
+    show: () => AnimationModalRefAttributes;
+    hide: () => AnimationModalRefAttributes;
+    setData: (data?: any) => AnimationModalRefAttributes;
     getData: () => any;
 };
-export declare const AnimationModal: React.ForwardRefExoticComponent<React.PropsWithoutRef<AnimationModalProps> & React.RefAttributes<RefAttributes>>;
-export {};
+export declare const AnimationModal: React.ForwardRefExoticComponent<React.PropsWithoutRef<AnimationModalProps> & React.RefAttributes<AnimationModalRefAttributes>>;
 //# sourceMappingURL=AnimationModal.d.ts.map

package/dist/components/AnimationModal/AnimationModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AnimationModal.d.ts","sourceRoot":"","sources":["../../../src/components/AnimationModal/AnimationModal.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAUL,UAAU,EACX,MAAM,cAAc,CAAC;AAItB,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;IAC5C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,KAAK,CAAC,EAAE;QACN,eAAe,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;KAC1C,CAAC;CACH,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,aAAa,CAAC;IAC1B,IAAI,EAAE,MAAM,aAAa,CAAC;IAC1B,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,aAAa,CAAC;IACvC,OAAO,EAAE,MAAM,GAAG,CAAC;CACpB,CAAC;AAMF,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,yBAAyB,CAC1D,KAAK,CAAC,eAAe,CAAC,mBAAmB,CAAC,GACxC,KAAK,CAAC,aAAa,CAAC,aAAa,CAAC,CAkIpC,CAAC"}
+{"version":3,"file":"AnimationModal.d.ts","sourceRoot":"","sources":["../../../src/components/AnimationModal/AnimationModal.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAUL,UAAU,EACX,MAAM,cAAc,CAAC;AAItB,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,GAAG,WAAW,CAAC;IAC5C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,KAAK,CAAC,EAAE;QACN,eAAe,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;KAC1C,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,2BAA2B,CAAC;IACxC,IAAI,EAAE,MAAM,2BAA2B,CAAC;IACxC,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,2BAA2B,CAAC;IACrD,OAAO,EAAE,MAAM,GAAG,CAAC;CACpB,CAAC;AAMF,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,yBAAyB,CAC1D,KAAK,CAAC,eAAe,CAAC,mBAAmB,CAAC,GACxC,KAAK,CAAC,aAAa,CAAC,2BAA2B,CAAC,CAsIlD,CAAC"}

package/dist/components/Hud/AlertBottomView/AlertBottomView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AlertBottomView.d.ts","sourceRoot":"","sources":["../../../../src/components/Hud/AlertBottomView/AlertBottomView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAQL,SAAS,EACT,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAMtB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACnC,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC;IACrC,qBAAqB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC3C,eAAe,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACtC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5C,gBAAgB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACvC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAC;IACrD,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB,CAAC;;AAKF,wBAkHG;AAEH,eAAO,MAAM,kBAAkB,uCAAmC,CAAC;AAEnE,eAAO,MAAM,oBAAoB,GAAI,OAAO,OAAO,CAAC,kBAAkB,CAAC,SAEtE,CAAC"}
+{"version":3,"file":"AlertBottomView.d.ts","sourceRoot":"","sources":["../../../../src/components/Hud/AlertBottomView/AlertBottomView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAQL,SAAS,EACT,SAAS,EACT,SAAS,EACV,MAAM,cAAc,CAAC;AAQtB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACnC,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC;IACrC,qBAAqB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC3C,eAAe,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACtC,MAAM,EAAE,MAAM,IAAI,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IAC5C,gBAAgB,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;IACvC,OAAO,EAAE,MAAM,IAAI,CAAC;CACrB,CAAC;AAEF,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,KAAK,IAAI,CAAC;IACrD,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB,CAAC;;AAKF,wBAsGG;AAEH,eAAO,MAAM,kBAAkB,uCAAmC,CAAC;AAEnE,eAAO,MAAM,oBAAoB,GAAI,OAAO,OAAO,CAAC,kBAAkB,CAAC,SAEtE,CAAC"}

package/dist/components/Hud/AlertBottomView/AlertBottomView.js

@@ -1,6 +1,6 @@
 import * as React from "react";
-import { View, Text, StyleSheet, Platform, StatusBar, TouchableOpacity, Dimensions, } from "react-native";
-import Modal from "react-native-modal";
+import { View, Text, StyleSheet, Platform, StatusBar, TouchableOpacity, } from "react-native";
+import { AnimationModal, } from "../../AnimationModal/AnimationModal";
 import { px2dp, deviceWidth } from "../../../screen/px2dp";
 import { px2sp } from "../../../screen/px2sp";
 export default React.forwardRef((_, ref) => {
@@ -12,9 +12,11 @@ export default React.forwardRef((_, ref) => {
     const [state, setState] = React.useState(defaultState);
     const cancelCallbackRef = React.useRef(undefined);
     const confirmCallbackRef = React.useRef(undefined);
+    const animationModalRef = React.useRef(null);
     React.useImperativeHandle(ref, () => ({
         show: async (options) => {
             setState(Object.assign({}, defaultState, { visible: true }, options));
+            animationModalRef.current?.show();
             cancelCallbackRef.current = options.cancel;
             confirmCallbackRef.current = options.confirm;
         },
@@ -22,6 +24,7 @@ export default React.forwardRef((_, ref) => {
     }), []);
     const hide = async () => {
         setState(defaultState);
+        animationModalRef.current?.hide();
     };
     React.useEffect(() => {
         if (Platform.OS == "android") {
@@ -35,15 +38,7 @@ export default React.forwardRef((_, ref) => {
             }
         }
     }, [state.visible]);
-    return (<Modal hideModalContentWhileAnimating={true} //通过隐藏模态内容直到动画完成来增强性能
-     useNativeDriver={true} //定义动画是否应使用本机驱动程序
-     animationIn="slideInUp" animationOut="slideOutDown" onBackButtonPress={() => {
-            //按下Android后退按钮时调用
-            hide();
-        }} onBackdropPress={() => {
-            //按下背景时调用
-            hide();
-        }} isVisible={state.visible} style={{ margin: 0 }} deviceHeight={Dimensions.get("screen").height}>
+    return (<AnimationModal ref={animationModalRef}>
       <View style={styles.container}>
         <View style={[styles.wrapper, state.wrapperStyle]}>
           {state.title && <Text style={styles.titleText}>{state.title}</Text>}
@@ -87,7 +82,7 @@ export default React.forwardRef((_, ref) => {
             </View>)}
         </View>
       </View>
-    </Modal>);
+    </AnimationModal>);
 });
 export const alertBottomViewRef = React.createRef();
 export const showAlertBottomModal = (props) => {