From 57d4e972ef318ace26829cfe3c568e75b7ba5c14 Mon Sep 17 00:00:00 2001
From: duqingquan <duqingquan@dcloud.io>
Date: Wed, 18 Oct 2023 21:28:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=A4=BA=E4=BE=8B=20?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=BA=E5=BA=A7?=
 =?UTF-8?q?=E7=9A=84=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utssdk/app-android/index.uts              | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/uni_modules/uts-platform-api/utssdk/app-android/index.uts b/uni_modules/uts-platform-api/utssdk/app-android/index.uts
index bb7b0f1..2b5db4b 100644
--- a/uni_modules/uts-platform-api/utssdk/app-android/index.uts
+++ b/uni_modules/uts-platform-api/utssdk/app-android/index.uts
@@ -69,7 +69,7 @@ export function getAppTempPathTest() : boolean {
 		return true
 	}
 	// 2.0的路径
-	if (UTSAndroid.getAppTempPath()!.contains("data/io.dcloud.uniappx/apps/") && UTSAndroid.getAppTempPath()!.contains("cache/temp")) {
+	if (UTSAndroid.getAppTempPath()!.contains("cache/temp")) {
 		return true
 	}
 	
@@ -268,6 +268,17 @@ export function unRegLifecycle() {
  */
 export function arrayPermissionFlowTest(callback : (ret : boolean, desc : string) => void) {
 
+
+	if("io.dcloud.uniappx" != UTSAndroid.getAppContext()?.packageName && "io.dcloud.HBuilder" != UTSAndroid.getAppContext()?.packageName){
+		/**
+		 * 说明是自定义基座，不支持权限测试
+		 */
+		uni.showToast({
+			title:'自定义基座不支持当前测试'
+		})
+		return 
+	}
+	
 	/**
 	 * 同时申请日历和联系人权限
 	 */
@@ -377,10 +388,18 @@ export function convert2AbsFullPathTest() : boolean {
 		return false;
 	}
 
-	if (!resourcePath.contains("Android/data/io.dcloud")) {
-		console.log("路径转换结果错误")
-		return false;
+
+	if("io.dcloud.uniappx" == UTSAndroid.getAppContext()?.packageName || "io.dcloud.HBuilder" == UTSAndroid.getAppContext()?.packageName){
+		/**
+		 * 只有标准基座，校验这个选项
+		 */
+		if (!resourcePath.contains("Android/data/io.dcloud")) {
+			console.log("路径转换结果错误")
+			return false;
+		}
 	}
+	
+	
 
 	let sdcardPath = UTSAndroid.convert2AbsFullPath(resourcePath)
 	console.log(sdcardPath)
@@ -399,6 +418,16 @@ export function convert2AbsFullPathTest() : boolean {
  * 单个权限，申请流程测试
  */
 export function singlePermissionFlowTest(callback : (ret : boolean, desc : string) => void) {
+	
+	if("io.dcloud.uniappx" != UTSAndroid.getAppContext()?.packageName && "io.dcloud.HBuilder" != UTSAndroid.getAppContext()?.packageName){
+		/**
+		 * 说明是自定义基座，不支持权限测试
+		 */
+		uni.showToast({
+			title:'自定义基座不支持当前测试'
+		})
+		return 
+	}
 
 	let permissionNeed = utsArrayOf("android.permission.READ_PHONE_STATE")
 	if (UTSAndroid.getSystemPermissionDenied(UTSAndroid.getUniActivity()!, permissionNeed).isEmpty()) {
-- 
GitLab