@aks-dev/easyui 1.0.37 → 1.0.40

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-05-23 19:16:19
+ * @LastEditTime: 2022-05-25 11:47:17
  * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/UpgradeModule.java
  */
 package com.easyui;
@@ -25,6 +25,7 @@ import android.os.Environment;
 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;
@@ -134,10 +135,14 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
                 final AlertDialog dialog = builder.show();
 
                 WindowManager m = currentActivity.getWindowManager();
-                Display d = m.getDefaultDisplay();
                 WindowManager.LayoutParams p = dialog.getWindow().getAttributes();
-                p.width = (int) (d.getWidth() * 0.90);
+                DisplayMetrics metrics = new DisplayMetrics();
+                m.getDefaultDisplay().getMetrics(metrics);
+                int widthPixels = metrics.widthPixels;
+                p.width = (int) (widthPixels * 0.90);
                 p.height = p.width * 780 / 680;
+
+
                 dialog.getWindow().setAttributes(p);
                 Window window = dialog.getWindow();
                 window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

package/ios/UpgradeModule.m

@@ -84,6 +84,10 @@ RCT_EXPORT_METHOD(upgrade:(NSDictionary *)info
  
 }
 
+- (NSString*) getLocalVersion {
+  return [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
+}
+
 /**
  版本比较
  */

package/jsbridge/UpgradeModule.tsx

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-05-05 14:19:39
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-24 10:11:17
+ * @LastEditTime: 2022-05-24 14:08:49
  * @FilePath: /@aks-dev/easyui/jsbridge/UpgradeModule.tsx
  */
 import { NativeModules, PermissionsAndroid, Platform } from 'react-native';
@@ -14,8 +14,8 @@ import type { UpgradeOptions } from '.'
 export const getAppVersion = () => UpgradeModule.getAppVersion();
 
 
-export const upgrade = async (props: UpgradeOptions) => {
-    const { title = '提示' } = props
+export const upgrade = async (options: UpgradeOptions ) => {
+    const { title = '提示' } = options
 
     if (Platform.OS == 'android') {
         try {
@@ -27,15 +27,15 @@ export const upgrade = async (props: UpgradeOptions) => {
                 buttonPositive: "确定"
             })
             if (granted === PermissionsAndroid.RESULTS.GRANTED) {
-                return UpgradeModule.upgrade(props)
-            } else {
-                return Promise.reject("没有应用升级权限！")
+                return UpgradeModule.upgrade(options)
             }
+
+            return Promise.reject("没有应用升级权限！")
         } catch (err) {
             return Promise.reject("请求权限异常！")
         }
 
     }
 
-    return UpgradeModule.upgrade(props)
+    return UpgradeModule.upgrade(options)
 }

package/jsbridge/index.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-23 19:46:15
+ * @LastEditTime: 2022-05-24 14:08:39
  * @FilePath: /@aks-dev/easyui/jsbridge/index.ts
  */
 /**
@@ -25,4 +25,4 @@
   * @description: app升级
   * @return {*}
   */
- export declare const upgrade: (props: UpgradeOptions) => Promise<string>;
+ export declare const upgrade: (options: UpgradeOptions) => Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.37",
+  "version": "1.0.40",
   "description": "爱科森开发工具包(react-native)",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",
@@ -23,7 +23,6 @@
     "/screen",
     "/jsbridge",
     "/utils",
-    "/lib/Echarts/echarts.min.js",
     "/**/*.png",
     "!/tsconfig.json",
     "!/tsconfig.md"