From 8231d2af7893e221d90c71bd5dec4cf3f2f1f0ce Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 十一月 2023 19:07:59 +0800
Subject: [PATCH] 2023年11月30日19:07:47

---
 app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/AppDownloadManager.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/AppDownloadManager.java b/app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/AppDownloadManager.java
index 4274497..e5188ad 100644
--- a/app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/AppDownloadManager.java
+++ b/app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/AppDownloadManager.java
@@ -87,7 +87,7 @@
             request.setDescription(desc);
             // 瀹屾垚鍚庢樉绀洪�氱煡鏍�
             request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-            request.setDestinationInExternalFilesDir(weakReference.get(), Environment.DIRECTORY_DOWNLOADS, HdlAppUpdateLogic.ApkFileName);
+            request.setDestinationInExternalFilesDir(weakReference.get(), Environment.DIRECTORY_DOWNLOADS, HdlAppUpdateLogic.getInstance().getApkFileName());
             request.setMimeType("application/vnd.android.package-archive");
         } else {
             request.setDestinationInExternalFilesDir(weakReference.get(), Environment.DIRECTORY_DOWNLOADS, HDLUniMP.UNI_APP_ID + ".wgt");
@@ -199,9 +199,9 @@
                                 @Override
                                 public void run() {
                                     AndroidPermissionActivity.sListener = listener;
-                                    Intent intent1 = new Intent(context, AndroidPermissionActivity.class);
-                                    intent1.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                                    context.startActivity(intent1);
+                                    Intent intentPermission = new Intent(context, AndroidPermissionActivity.class);
+                                    intentPermission.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                    context.startActivity(intentPermission);
                                 }
                             }, 2000);
 
@@ -221,8 +221,8 @@
 
 
     /**
-     * @param context
-     * @param intent
+     * @param context -
+     * @param intent  -
      */
     private void installApk(Context context, Intent intent) {
         long completeDownLoadId = intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1);
@@ -235,7 +235,7 @@
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { // 6.0浠ヤ笅
                 uri = mDownloadManager.getUriForDownloadedFile(completeDownLoadId);
                 if (null == uri) {
-                    File apkFile = new File(weakReference.get().getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), HdlAppUpdateLogic.ApkFileName);
+                    File apkFile = new File(weakReference.get().getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), HdlAppUpdateLogic.getInstance().getApkFileName());
                     if (apkFile.exists()) {
                         uri = Uri.fromFile(apkFile);
                     }
@@ -246,7 +246,7 @@
             } else { // Android 7.0 浠ヤ笂
                 uri = FileProvider.getUriForFile(context,
                         "com.hdl.debugtreasure.dc.fileprovider",
-                        new File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), HdlAppUpdateLogic.ApkFileName));
+                        new File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), HdlAppUpdateLogic.getInstance().getApkFileName()));
                 intentInstall.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
             }
             // 瀹夎搴旂敤

--
Gitblit v1.8.0