From 76dee953e6cbb67adccc13cee59d6b5eea397c3d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 04 十二月 2023 17:52:31 +0800
Subject: [PATCH] 2023年12月04日17:52:21
---
app/src/main/java/com/hdl/photovoltaic/widget/apkwgtupload/AppDownloadManager.java | 10 +++++++---
app/src/main/AndroidManifest.xml | 13 +++++++++++++
app/src/main/res/xml/provider_paths.xml | 9 +++++++++
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 86d558b..06a4143 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -124,6 +124,7 @@
<activity
android:name=".ui.HomeLoginActivity"
android:exported="false" />
+ <activity android:name=".widget.apkwgtupload.AndroidPermissionActivity" />
<activity
android:name=".ui.StartActivity"
android:exported="true">
@@ -135,6 +136,18 @@
</activity> <!-- 娉ㄥ唽鏈嶅姟 -->
<service android:name=".internet.HttpServer.MyNanoHttpService" />
+ <provider
+ android:name="androidx.core.content.FileProvider"
+ android:authorities="com.hdl.photovoltaic.fileProvider"
+ android:exported="false"
+ android:grantUriPermissions="true"
+ tools:replace="android:authorities">
+ <meta-data
+ android:name="android.support.FILE_PROVIDER_PATHS"
+ android:resource="@xml/provider_paths"
+ tools:replace="android:resource" />
+ </provider>
+
<meta-data
android:name="design_height_in_dp"
android:value="812" />
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 e5188ad..8c02c16 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
@@ -110,8 +110,11 @@
//璁剧疆鐩戝惉Uri.parse("content://downloads/my_downloads")
weakReference.get().getContentResolver().registerContentObserver(Uri.parse("content://downloads/my_downloads"), true,
mDownLoadChangeObserver);
+
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(DownloadManager.ACTION_DOWNLOAD_COMPLETE);
// 娉ㄥ唽骞挎挱锛岀洃鍚珹PK鏄惁涓嬭浇瀹屾垚
- weakReference.get().registerReceiver(mDownloadReceiver, new IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE));
+ weakReference.get().registerReceiver(mDownloadReceiver, intentFilter);
}
/**
@@ -148,7 +151,8 @@
downSuccess = true;
Log.i(TAG, "涓嬭浇杩涘害锛氬畬鎴�");
}
- Log.i(TAG, "涓嬭浇杩涘害锛�" + bytesAndStatus[0] + "/" + bytesAndStatus[1] + "");
+ long value = bytesAndStatus[0]* 100L / bytesAndStatus[1];
+ Log.i(TAG, "涓嬭浇杩涘害锛�" + value + "");
}
class DownloadChangeObserver extends ContentObserver {
@@ -245,7 +249,7 @@
uri = Uri.fromFile(apkFile);
} else { // Android 7.0 浠ヤ笂
uri = FileProvider.getUriForFile(context,
- "com.hdl.debugtreasure.dc.fileprovider",
+ "com.hdl.photovoltaic.fileProvider",
new File(context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), HdlAppUpdateLogic.getInstance().getApkFileName()));
intentInstall.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
}
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 0000000..71a263a
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths>
+ <external-path
+ name="external"
+ path="" />
+ <external-files-path
+ name="Download"
+ path="" />
+</paths>
\ No newline at end of file
--
Gitblit v1.8.0