@aks-dev/easyui 1.0.27 → 1.0.30

package/android/src/main/AndroidManifest.xml

@@ -20,7 +20,7 @@
     <application>
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.sg.upgrade.provider"
+            android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data

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-20 17:43:52
+ * @LastEditTime: 2022-05-23 18:21:04
  * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/UpgradeModule.java
  */
 package com.easyui;
@@ -107,7 +107,8 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
         String note = (String) hashMap.get("note");
         Boolean force = (Boolean) hashMap.get("force");
         if (!checkUpdate(version, this.getAppVersionName())) {
-            promise.resolve("已是最新版本");
+
+            promise.reject("error_app_upgrade","已是最新版本");
         }
         Activity currentActivity = context.getCurrentActivity();
         int permission = ActivityCompat.checkSelfPermission(context.getApplicationContext(),
@@ -119,7 +120,6 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
                     EXTERNAL_STORAGE_REQ_CODE);
         }
 
-
         runOnMainThread(new Runnable() {
             @Override
             public void run() {
@@ -164,6 +164,8 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
                 });
             }
         });
+
+        promise.resolve("发现新版本");
     }
 
     /**
@@ -249,8 +251,9 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
         File directory = cw.getExternalFilesDir(Environment.DIRECTORY_MUSIC);
         Activity currentActivity = context.getCurrentActivity();
         //判断是否是AndroidN以及更高的版本
+        String packageName = context.getPackageName();
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            Uri contentUri = FileProvider.getUriForFile(currentActivity,"com.sg.upgrade.provider", new File(directory, mDownloadFile));
+            Uri contentUri = FileProvider.getUriForFile(currentActivity,packageName+".provider", new File(directory, mDownloadFile));
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
             intent.setDataAndType(contentUri,"application/vnd.android.package-archive");

package/android/src/main/res/drawable/update_cancel_btn.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <!--<solid android:color="@android:color/transparent" />-->
+    <!-- 设置按钮的四个角为弧形 -->
+    <!-- android:radius 弧形的半径 -->
+    <corners android:radius="4dp" />
+    <!--边框的宽度及颜色-->
+    <stroke android:width="2px" android:color="#CCCCCC" />
+</shape>

package/android/src/main/res/drawable/update_confirm_btn.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="#EA6561" />
+    <!-- 设置按钮的四个角为弧形 -->
+    <!-- android:radius 弧形的半径 -->
+    <corners android:radius="4dp" />
+    <!--边框的宽度及颜色-->
+    <!--<stroke android:width="2px" android:color="#388e3c" />-->
+</shape>

package/android/src/main/res/layout/update_dialog.xml

@@ -32,7 +32,7 @@
             android:id="@+id/btn_comfirm"
             android:layout_width="200dp"
             android:layout_height="35dp"
-            android:textColor="@color/white"
+            android:textColor="#FFFFFF"
             android:background="@drawable/update_confirm_btn"
             android:text="立即升级"
             style="?android:attr/borderlessButtonStyle" />

package/jsbridge/UpgradeModule.tsx

@@ -2,12 +2,16 @@
  * @Author: shiguo
  * @Date: 2022-05-05 14:19:39
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-07 11:41:41
- * @FilePath: /@aks/easyui/jsbridge/UpgradeModule.tsx
+ * @LastEditTime: 2022-05-23 18:22:39
+ * @FilePath: /@aks-dev/easyui/jsbridge/UpgradeModule.tsx
  */
 import { NativeModules } from 'react-native';
 
 const { UpgradeModule } = NativeModules;
 
+import type { UpgradeOptions } from '.'
 
-export const getAppVersion = () => UpgradeModule.getAppVersion();
+export const getAppVersion = () => UpgradeModule.getAppVersion();
+
+
+export const upgrade = (props: UpgradeOptions) => UpgradeModule.upgrade(props)

package/jsbridge/index.ts

@@ -2,12 +2,26 @@
  * @Author: shiguo
  * @Date: 2022-04-19 10:23:01
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-05 14:29:15
- * @FilePath: /@aks/easyui/jsbridge/index.ts
+ * @LastEditTime: 2022-05-23 18:25:02
+ * @FilePath: /@aks-dev/easyui/jsbridge/index.ts
  */
 /**
  * @description: 获取App版本号
  * @param {*}
  * @return {*}
  */
-export declare const getAppVersion:()=>Promise<string>;
+ export declare const getAppVersion: () => Promise<string>;
+
+
+ export declare type UpgradeOptions = {
+     version: string;
+     downloadUrl: string;
+     note: string;
+     force: boolean;
+ };
+ 
+ /**
+  * @description: app升级
+  * @return {*}
+  */
+ export declare const upgrade: (props: UpgradeOptions) => Promise<string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.27",
+  "version": "1.0.30",
   "description": "爱科森开发工具包(react-native)",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",