@aks-dev/easyui 1.0.26 → 1.0.29

package/android/src/main/AndroidManifest.xml

@@ -16,5 +16,17 @@
             </action>
         </intent>
     </queries>
+
+    <application>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
+    </application>
 </manifest>
   

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

@@ -2,28 +2,70 @@
  * @Author: shiguo
  * @Date: 2022-05-05 13:57:25
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-07 11:41:32
- * @FilePath: /@aks/easyui/android/src/main/java/com/easyui/UpgradeModule.java
+ * @LastEditTime: 2022-05-23 18:21:04
+ * @FilePath: /@aks-dev/easyui/android/src/main/java/com/easyui/UpgradeModule.java
  */
 package com.easyui;
 
+import android.Manifest;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.view.Display;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+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.jetbrains.annotations.NotNull;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.HashMap;
+
 public class UpgradeModule extends ReactContextBaseJavaModule {
 
-    private Context context;
+    private ReactApplicationContext context;
+    public static final int EXTERNAL_STORAGE_REQ_CODE = 10 ;
+    private static Handler mHandler = new Handler(Looper.getMainLooper());
+    private ProgressDialog mProgressDialog;
+    private String mDownloadFile;
+
 
+    private static void runOnMainThread(Runnable runnable) {
+        mHandler.postDelayed(runnable, 0);
+    }
 
     @NonNull
     @NotNull
@@ -36,19 +78,306 @@ public class UpgradeModule extends ReactContextBaseJavaModule {
     public UpgradeModule(ReactApplicationContext reactContext) {
         super(reactContext);
         this.context = reactContext;
+
     }
 
-    @ReactMethod
-    public void getAppVersion(final Promise promise) {
+
+    private String getAppVersionName() {
         try {
             PackageManager manager = context.getPackageManager();
             PackageInfo info = manager.getPackageInfo(context.getPackageName(), 0);
-            promise.resolve(info.versionName);
+            return info.versionName;
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
-            promise.reject("1.0.0", "getAppVersion error");
+            return "1.0.0";
         }
+    }
 
+    @ReactMethod
+    public void getAppVersion(final Promise promise) {
+        promise.resolve(this.getAppVersionName());
     }
 
+
+    @ReactMethod
+    public void upgrade(final ReadableMap info, final Promise promise) {
+        HashMap hashMap = info.toHashMap();
+        String version = (String) hashMap.get("version");
+        String downloadUrl = (String) hashMap.get("downloadUrl");
+        String note = (String) hashMap.get("note");
+        Boolean force = (Boolean) hashMap.get("force");
+        if (!checkUpdate(version, this.getAppVersionName())) {
+
+            promise.reject("error_app_upgrade","已是最新版本");
+        }
+        Activity currentActivity = context.getCurrentActivity();
+        int permission = ActivityCompat.checkSelfPermission(context.getApplicationContext(),
+                Manifest.permission.WRITE_EXTERNAL_STORAGE);
+
+        if (permission != PackageManager.PERMISSION_GRANTED) {
+            // 请求权限
+            ActivityCompat.requestPermissions(currentActivity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                    EXTERNAL_STORAGE_REQ_CODE);
+        }
+
+        runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                View view = View.inflate(currentActivity, R.layout.update_dialog, null);
+                AlertDialog.Builder builder = new AlertDialog.Builder(currentActivity);
+                builder.setView(view);
+                if (force) {
+                    builder.setCancelable(false);
+                }
+                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);
+                p.height = p.width * 780 / 680;
+                dialog.getWindow().setAttributes(p);
+                Window window = dialog.getWindow();
+                window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+                TextView contentView = view.findViewById(R.id.content);
+                Button confirmBtn = view.findViewById(R.id.btn_comfirm);
+                Button cancelBtn = view.findViewById(R.id.btn_cancel);
+
+                contentView.setText(note);
+                confirmBtn.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        dialog.dismiss();
+                        start(downloadUrl);
+                    }
+                });
+                cancelBtn.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (force) {
+                            android.os.Process.killProcess(android.os.Process.myPid());
+                        } else {
+                            dialog.dismiss();
+                        }
+                    }
+                });
+            }
+        });
+
+        promise.resolve("发现新版本");
+    }
+
+    /**
+     * 版本更新檢查
+     *
+     * @param remoteVersion
+     * @param localVersion
+     * @return true 需要更新 false 不需要更新
+     */
+    public boolean checkUpdate(String remoteVersion, String localVersion) {
+
+        if (localVersion == null || localVersion.length() == 0 || remoteVersion == null || remoteVersion.length() == 0) {
+            return false;
+        }
+        String[] localVers = localVersion.split("\\.");
+        String[] remoteVers = remoteVersion.split("\\.");
+        // 对比主版本
+        if (compareVersion(localVers, remoteVers, 0) > 0) {
+            return false;
+        }
+        if (compareVersion(localVers, remoteVers, 0) < 0) {
+            return true;
+        }
+        // 对比子版本
+        if (compareVersion(localVers, remoteVers, 1) > 0) {
+            return false;
+        }
+        if (compareVersion(localVers, remoteVers, 1) < 0) {
+            return true;
+        }
+        // 对比fix版本
+        if (compareVersion(localVers, remoteVers, 2) < 0) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 判断是否需要更新
+     *
+     * @param localVers  本地版本
+     * @param remoteVers 远程版本
+     * @param idx        版本索引
+     * @return
+     */
+    public int compareVersion(String[] localVers, String[] remoteVers, int idx) {
+        if (remoteVers.length > idx && localVers.length <= idx) {
+            return -1;
+        }
+        if (remoteVers.length <= idx && localVers.length > idx) {
+            return 1;
+        }
+        if (remoteVers.length <= idx && localVers.length <= idx) {
+            return 0;
+        }
+        Integer localVer = Integer.parseInt(localVers[idx]);
+        Integer remoteVer = Integer.parseInt(remoteVers[idx]);
+        return localVer.compareTo(remoteVer);
+    }
+
+    /**
+     * 开始更新
+     *
+     * @param downloadUrl
+     */
+    public void start(String downloadUrl) {
+        Activity currentActivity = context.getCurrentActivity();
+        mProgressDialog = new ProgressDialog(currentActivity);
+        mProgressDialog.setCanceledOnTouchOutside(false);
+        mProgressDialog.setTitle("升级文件下载中，请稍候...");
+        mProgressDialog.setIndeterminate(true);
+        mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+        mProgressDialog.setCancelable(false);
+        final DownloadTask downloadTask = new DownloadTask(currentActivity);
+        downloadTask.execute(downloadUrl);
+    }
+
+    private void updateApk() {
+        //安装应用
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        //sg
+        ContextWrapper cw = new ContextWrapper(getReactApplicationContext());
+        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,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");
+        } else {
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.setDataAndType(Uri.fromFile(new File(directory, mDownloadFile)),
+                    "application/vnd.android.package-archive");
+        }
+        currentActivity.startActivity(intent);
+    }
+
+    /**
+     * 下载应用
+     *
+     * @author Administrator
+     */
+    class DownloadTask extends AsyncTask<String, Integer, String> {
+
+        private Context context;
+        private PowerManager.WakeLock mWakeLock;
+
+        public DownloadTask(Context context) {
+            this.context = context;
+        }
+
+        @Override
+        protected String doInBackground(String... sUrl) {
+            InputStream input = null;
+            OutputStream output = null;
+            HttpURLConnection connection = null;
+            File file = null;
+            try {
+                URL url = new URL(sUrl[0]);
+                connection = (HttpURLConnection) url.openConnection();
+                connection.connect();
+                // expect HTTP 200 OK, so we don't mistakenly save error
+                // report
+                // instead of the file
+                if (connection.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                    return "Server returned HTTP "
+                            + connection.getResponseCode() + " "
+                            + connection.getResponseMessage();
+                }
+                // this will be useful to display download percentage
+                // might be -1: server did not report the length
+                int fileLength = connection.getContentLength();
+
+                mDownloadFile = "app_" + String.valueOf(System.currentTimeMillis()) + ".apk";
+                //sg
+                ContextWrapper cw = new ContextWrapper(getReactApplicationContext());
+                File directory = cw.getExternalFilesDir(Environment.DIRECTORY_MUSIC);
+                file = new File(directory, mDownloadFile);
+                //
+                if (!file.exists()) {
+                    // 判断父文件夹是否存在
+                    if (!file.getParentFile().exists()) {
+                        file.getParentFile().mkdirs();
+                    }
+                }
+                input = connection.getInputStream();
+                output = new FileOutputStream(file);
+                byte data[] = new byte[4096];
+                long total = 0;
+                int count;
+                while ((count = input.read(data)) != -1) {
+                    // allow canceling with back button
+                    if (isCancelled()) {
+                        input.close();
+                        return null;
+                    }
+                    total += count;
+                    // publishing the progress....
+                    if (fileLength > 0) // only if total length is known
+                        publishProgress((int) (total * 100 / fileLength));
+                    output.write(data, 0, count);
+
+                }
+            } catch (Exception e) {
+                System.out.println(e.toString());
+                return e.toString();
+
+            } finally {
+                try {
+                    if (output != null)
+                        output.close();
+                    if (input != null)
+                        input.close();
+                } catch (IOException ignored) {
+                }
+                if (connection != null)
+                    connection.disconnect();
+            }
+            return null;
+        }
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            PowerManager pm = (PowerManager) context
+                    .getSystemService(Context.POWER_SERVICE);
+            mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+                    getClass().getName());
+            mWakeLock.acquire();
+            mProgressDialog.show();
+        }
+
+        @Override
+        protected void onProgressUpdate(Integer... progress) {
+            super.onProgressUpdate(progress);
+            // if we get here, length is known, now set indeterminate to false
+            mProgressDialog.setIndeterminate(false);
+            mProgressDialog.setMax(100);
+            mProgressDialog.setProgress(progress[0]);
+        }
+
+        @Override
+        protected void onPostExecute(String result) {
+            mWakeLock.release();
+            mProgressDialog.dismiss();
+            if (result != null) {
+                Toast.makeText(context, "您未打开SD卡权限" + result, Toast.LENGTH_LONG).show();
+            } else {
+                updateApk();
+            }
+        }
+    }
 }

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

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/update_root"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/upgrade_bg">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="190dp"
+        android:layout_alignParentBottom="true"
+        android:paddingLeft="15dp"
+        android:paddingRight="15dp">
+
+        <TextView
+            android:id="@+id/content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="false"
+            android:text="1.升级说明123123\\n2.升级说明22222"/>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:layout_alignParentBottom="true"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <Button
+            android:id="@+id/btn_comfirm"
+            android:layout_width="200dp"
+            android:layout_height="35dp"
+            android:textColor="#FFFFFF"
+            android:background="@drawable/update_confirm_btn"
+            android:text="立即升级"
+            style="?android:attr/borderlessButtonStyle" />
+
+        <Button
+            android:id="@+id/btn_cancel"
+            android:layout_width="200dp"
+            android:layout_height="35dp"
+            android:layout_alignBottom="@id/btn_comfirm"
+            android:background="@drawable/update_cancel_btn"
+            android:layout_marginTop="10dp"
+            android:textColor="#CCCCCC"
+            android:text="残忍拒绝"
+            style="?android:attr/borderlessButtonStyle" />
+    </LinearLayout>
+</RelativeLayout>

package/android/src/main/res/xml/file_paths.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <root-path name="root" path="/" />
+    <files-path name="files" path="/" />
+    <cache-path name="cache" path="/" />
+    <external-path name="external" path="/" />
+    <external-files-path name="external_file_path" path="/" />
+    <external-cache-path name="external_cache_path" path="/" />
+    <external-files-path
+        name="umeng_cache"
+        path="umeng_cache/" />
+</paths>

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,22 @@
  * @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:21:50
+ * @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;
+ };
+ 
+ export declare const upgrade: (props: UpgradeOptions) => Promise<string>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.26",
-  "description": "爱科森开发工具包",
+  "version": "1.0.29",
+  "description": "爱科森开发工具包(react-native)",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",
   "scripts": {
@@ -33,7 +33,7 @@
     "type": "git",
     "url": "https://gitee.com/the_period_of_the_ten_kingdoms/aks-easyui"
   },
-  "author": "",
+  "author": "shiguo",
   "license": "MIT",
   "peerDependencies": {
     "@aks-dev/react-native-syan-image-picker": "*",