From 77d44406e09099759457df75cfd7413310228dba Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 11 Apr 2024 16:01:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/appUpdate.js | 22 +++++++++++++---------
 src/manifest.json       |  6 +++---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/common/appUpdate.js b/src/common/appUpdate.js
index 6c39ee1a..549ad662 100644
--- a/src/common/appUpdate.js
+++ b/src/common/appUpdate.js
@@ -22,7 +22,7 @@ export function appUpdate(isShowHint) {
 					var content = res.data.updateContent;
 					var version = res.data.installPackageVersion;
 					var isForcedUpdate = res.data.isForcedUpdate
-					var versionName =res.data.installPackageName
+					var versionName = res.data.installPackageName
 					console.log("新版本提示")
 					showDialog(versionName, content, isForcedUpdate, downUrl)
 
@@ -45,12 +45,12 @@ export function appUpdate(isShowHint) {
 					// 	}
 					// })
 				} else {
-					if(isShowHint){
+					if (isShowHint) {
 						uni.showToast({
 							title: "当前是最新版本"
 						})
 					}
-					
+
 					console.log("没有新版本")
 				}
 			}
@@ -124,12 +124,16 @@ export function confirm(downUrl) {
 					showLoading.setTitle("已连接到服务器");
 					break;
 				case 3:
-					prg = parseInt(
-						(parseFloat(task.downloadedSize) /
-							parseFloat(task.totalSize)) *
-						100
-					);
-					showLoading.setTitle("  正在下载" + prg + "%  ");
+					if (task.totalSize && > task.totalSize0) {
+						prg = parseInt(
+							(parseFloat(task.downloadedSize) /
+								parseFloat(task.totalSize)) *
+							100
+						);
+						showLoading.setTitle("正在下载" + prg + "%  ");
+					}else {
+						showLoading.setTitle("正在下载");
+					}
 					break;
 				case 4:
 					plus.nativeUI.closeWaiting();
diff --git a/src/manifest.json b/src/manifest.json
index a67ee375..2d85d24e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -44,9 +44,9 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-					 "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-					 "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>"
 				],
                 "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
                 "minSdkVersion" : 23