shish 3 anni fa
parent
commit
3484c9e92b

+ 8 - 1
ghsApp/src/components/htz-image-upload/htz-image-upload.vue

@@ -198,7 +198,14 @@ import permision from "@/utils/wa-permission_1.1/permission.js"
 					//Android是动态权限,请求权限状态时会触发弹框询问是否赋权(如果已经同意或永久禁止则不会询问),所以必须使用异步方式来处理
 					//Android是动态权限,请求权限状态时会触发弹框询问是否赋权(如果已经同意或永久禁止则不会询问),所以必须使用异步方式来处理
 					var result = await permision.requestAndroidPermission('android.permission.READ_EXTERNAL_STORAGE')
 					var result = await permision.requestAndroidPermission('android.permission.READ_EXTERNAL_STORAGE')
 					if(Number(result) == -1){
 					if(Number(result) == -1){
-						this.$util.confirmModal({content:'请打开相册和手机存储权限'},() => {
+						this.$util.confirmModal({content:'请在权限管理中开启【读写手机存储】','okText':'去开启'},() => {
+							permision.gotoAppPermissionSetting()
+						})
+						return
+					}
+					var cameraResult = await permision.requestAndroidPermission('android.permission.CAMERA')
+					if(Number(cameraResult) == -1){
+						this.$util.confirmModal({content:'请在权限管理中开启【拍摄照片】','okText':'去开启'},() => {
 							permision.gotoAppPermissionSetting()
 							permision.gotoAppPermissionSetting()
 						})
 						})
 						return
 						return

+ 13 - 1
ghsApp/src/utils/util.js

@@ -1,6 +1,7 @@
 import CONSTANT from "@/constant";
 import CONSTANT from "@/constant";
 import { mobileReg } from "@/utils/tools/validate";
 import { mobileReg } from "@/utils/tools/validate";
 import { getMiniAppUrl, isWxBrowser } from "@/utils/common";
 import { getMiniAppUrl, isWxBrowser } from "@/utils/common";
+import permision from "@/utils/wa-permission_1.1/permission.js";
 // 是否为空
 // 是否为空
 const isEmpty = val => {
 const isEmpty = val => {
 	if (val instanceof Array) {
 	if (val instanceof Array) {
@@ -298,13 +299,24 @@ export const isLogin = () => {
 	return false;
 	return false;
 };
 };
 
 
-export const callUp = (mobile) =>{
+export async function callUp(mobile){
 	//#ifdef MP-WEIXIN
 	//#ifdef MP-WEIXIN
 	uni.makePhoneCall({
 	uni.makePhoneCall({
 		phoneNumber: mobile
 		phoneNumber: mobile
 	});
 	});
 	//#endif
 	//#endif
 	//#ifdef APP-PLUS
 	//#ifdef APP-PLUS
+	let env = uni.getSystemInfoSync().platform
+	if(env == 'android'){
+		//Android是动态权限,请求权限状态时会触发弹框询问是否赋权(如果已经同意或永久禁止则不会询问),所以必须使用异步方式来处理
+		var result = await permision.requestAndroidPermission('android.permission.CALL_PHONE')
+		if(Number(result) == -1){
+			confirmModal({content:'请在权限管理中开启【拨打电话】','okText':'去开启'},() => {
+				permision.gotoAppPermissionSetting()
+			})
+			return
+		}
+	}
 	plus.device.dial(mobile, true);
 	plus.device.dial(mobile, true);
 	//#endif
 	//#endif
 }
 }

+ 9 - 2
hdApp/src/components/htz-image-upload/htz-image-upload.vue

@@ -197,8 +197,15 @@ import permision from "@/utils/wa-permission_1.1/permission.js"
 				if(env == 'android'){
 				if(env == 'android'){
 					//Android是动态权限,请求权限状态时会触发弹框询问是否赋权(如果已经同意或永久禁止则不会询问),所以必须使用异步方式来处理
 					//Android是动态权限,请求权限状态时会触发弹框询问是否赋权(如果已经同意或永久禁止则不会询问),所以必须使用异步方式来处理
 					var result = await permision.requestAndroidPermission('android.permission.READ_EXTERNAL_STORAGE')
 					var result = await permision.requestAndroidPermission('android.permission.READ_EXTERNAL_STORAGE')
-					if(Number(result) != 1){
-						this.$util.confirmModal({content:'请打开相册和手机存储权限'},() => {
+					if(Number(result) == -1){
+						this.$util.confirmModal({content:'请在权限管理中开启【读写手机存储】','okText':'去开启'},() => {
+							permision.gotoAppPermissionSetting()
+						})
+						return
+					}
+					var cameraResult = await permision.requestAndroidPermission('android.permission.CAMERA')
+					if(Number(cameraResult) == -1){
+						this.$util.confirmModal({content:'请在权限管理中开启【拍摄照片】','okText':'去开启'},() => {
 							permision.gotoAppPermissionSetting()
 							permision.gotoAppPermissionSetting()
 						})
 						})
 						return
 						return

+ 13 - 1
hdApp/src/utils/util.js

@@ -1,6 +1,7 @@
 import CONSTANT from "@/constant";
 import CONSTANT from "@/constant";
 import { mobileReg } from "@/utils/tools/validate";
 import { mobileReg } from "@/utils/tools/validate";
 import { getMiniAppUrl, isWxBrowser } from "@/utils/common";
 import { getMiniAppUrl, isWxBrowser } from "@/utils/common";
+import permision from "@/utils/wa-permission_1.1/permission.js";
 // 是否为空
 // 是否为空
 const isEmpty = val => {
 const isEmpty = val => {
 	if (val instanceof Array) {
 	if (val instanceof Array) {
@@ -423,13 +424,24 @@ export const noStockRemind = () =>{
 	innerAudioContext.play()
 	innerAudioContext.play()
 }
 }
 
 
-export const callUp = (mobile) =>{
+export async function callUp(mobile){
 	//#ifdef MP-WEIXIN
 	//#ifdef MP-WEIXIN
 	uni.makePhoneCall({
 	uni.makePhoneCall({
 		phoneNumber: mobile
 		phoneNumber: mobile
 	});
 	});
 	//#endif
 	//#endif
 	//#ifdef APP-PLUS
 	//#ifdef APP-PLUS
+	let env = uni.getSystemInfoSync().platform
+	if(env == 'android'){
+		//Android是动态权限,请求权限状态时会触发弹框询问是否赋权(如果已经同意或永久禁止则不会询问),所以必须使用异步方式来处理
+		var result = await permision.requestAndroidPermission('android.permission.CALL_PHONE')
+		if(Number(result) == -1){
+			confirmModal({content:'请在权限管理中开启【拨打电话】','okText':'去开启'},() => {
+				permision.gotoAppPermissionSetting()
+			})
+			return
+		}
+	}
 	plus.device.dial(mobile, true);
 	plus.device.dial(mobile, true);
 	//#endif
 	//#endif
 }
 }