refactor(permission): 移除位置和麦克风权限相关代码
重构权限判断逻辑,移除不再需要的位置和麦克风权限请求代码 更新manifest文件,排除位置权限并调整版本号
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
"configurations" : [
|
||||
{
|
||||
"app" : {
|
||||
"launchtype" : "local"
|
||||
"launchtype" : "remote"
|
||||
},
|
||||
"app-plus" : {
|
||||
"launchtype" : "remote"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import $http from '@/config/requestConfig'
|
||||
import store from '@/store';
|
||||
import base from '@/config/baseUrl';
|
||||
import {
|
||||
getAppWxLatLon
|
||||
} from '@/plugins/utils';
|
||||
// import {
|
||||
// getAppWxLatLon
|
||||
// } from '@/plugins/utils';
|
||||
// #ifdef H5
|
||||
import {
|
||||
getLatLonH5,
|
||||
@@ -208,32 +208,32 @@ export const setPayAssign = function(orderInfo, callback) {
|
||||
// #endif
|
||||
}
|
||||
// 获取地址信息 (微信小程序、APP、公众号)
|
||||
export const getLatLon = function(tip) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const successProcess = function(res) {
|
||||
store.commit("setCurrentAddress", {
|
||||
latitude: res.latitude,
|
||||
longitude: res.longitude
|
||||
});
|
||||
resolve(res);
|
||||
};
|
||||
const errProcess = function(err) {
|
||||
reject(err);
|
||||
if (tip) {
|
||||
uni.showToast({
|
||||
title: err,
|
||||
icon: "none"
|
||||
});
|
||||
}
|
||||
};
|
||||
// #ifdef H5
|
||||
getLatLonH5(successProcess, errProcess);
|
||||
// #endif
|
||||
// #ifndef H5
|
||||
getAppWxLatLon(successProcess, errProcess);
|
||||
// #endif
|
||||
});
|
||||
}
|
||||
// export const getLatLon = function(tip) {
|
||||
// return new Promise((resolve, reject) => {
|
||||
// const successProcess = function(res) {
|
||||
// store.commit("setCurrentAddress", {
|
||||
// latitude: res.latitude,
|
||||
// longitude: res.longitude
|
||||
// });
|
||||
// resolve(res);
|
||||
// };
|
||||
// const errProcess = function(err) {
|
||||
// reject(err);
|
||||
// if (tip) {
|
||||
// uni.showToast({
|
||||
// title: err,
|
||||
// icon: "none"
|
||||
// });
|
||||
// }
|
||||
// };
|
||||
// // #ifdef H5
|
||||
// getLatLonH5(successProcess, errProcess);
|
||||
// // #endif
|
||||
// // #ifndef H5
|
||||
// getAppWxLatLon(successProcess, errProcess);
|
||||
// // #endif
|
||||
// });
|
||||
// }
|
||||
|
||||
// 查看是否有某本书的权限
|
||||
export const checkBookRight = function(data,callback) {
|
||||
|
||||
@@ -59,8 +59,6 @@
|
||||
"permissions" : [
|
||||
"<uses-feature android:name=\"android.hardware.camera\"/>",
|
||||
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
|
||||
@@ -75,7 +73,6 @@
|
||||
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
|
||||
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
|
||||
"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
|
||||
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
|
||||
"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
|
||||
"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
|
||||
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
|
||||
@@ -86,7 +83,11 @@
|
||||
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
|
||||
"minSdkVersion" : 21,
|
||||
"targetSdkVersion" : 30,
|
||||
"schemes" : "medicine"
|
||||
"schemes" : "medicine",
|
||||
"excludePermissions" : [
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
|
||||
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>"
|
||||
]
|
||||
},
|
||||
"sdkConfigs" : {
|
||||
"ad" : {},
|
||||
@@ -440,4 +441,3 @@
|
||||
}
|
||||
}
|
||||
// 小程序特有相关
|
||||
|
||||
|
||||
@@ -239,7 +239,14 @@ function judgePermission(permissionID, callback) {
|
||||
if (isIos) {
|
||||
handle(judgeIosPermissionLocation());
|
||||
} else {
|
||||
requestAndroidPermission("android.permission.ACCESS_FINE_LOCATION", "位置").then(handle);
|
||||
// requestAndroidPermission("android.permission.ACCESS_FINE_LOCATION", "位置").then(handle);
|
||||
}
|
||||
} else
|
||||
if (permissionID == "record") { // 麦克风
|
||||
if (isIos) {
|
||||
handle(judgeIosPermissionRecord());
|
||||
} else {
|
||||
// requestAndroidPermission("android.permission.RECORD_AUDIO", "麦克风").then(handle);
|
||||
}
|
||||
} else if (permissionID == "camera") { // 摄像头
|
||||
if (isIos) {
|
||||
@@ -253,12 +260,6 @@ function judgePermission(permissionID, callback) {
|
||||
} else {
|
||||
requestAndroidPermission("android.permission.READ_EXTERNAL_STORAGE", "相册读取").then(handle);
|
||||
}
|
||||
} else if (permissionID == "record") { // 麦克风
|
||||
if (isIos) {
|
||||
handle(judgeIosPermissionRecord());
|
||||
} else {
|
||||
requestAndroidPermission("android.permission.RECORD_AUDIO", "麦克风").then(handle);
|
||||
}
|
||||
} else if (permissionID == "push") { // 推送
|
||||
if (isIos) {
|
||||
handle(judgeIosPermissionPush());
|
||||
|
||||
@@ -503,45 +503,45 @@ function wxAppletsLocation(successCallback, errCallback) {
|
||||
}
|
||||
// 获取地址信息
|
||||
let locationAuthorize = true;
|
||||
export const getAppWxLatLon = function(successCallback, errCallback) {
|
||||
const _this = this;
|
||||
// #ifdef MP
|
||||
if (locationAuthorize) {
|
||||
uni.authorize({
|
||||
scope: 'scope.userLocation',
|
||||
success: () => {
|
||||
wxAppletsLocation(successCallback, errCallback);
|
||||
locationAuthorize = false;
|
||||
},
|
||||
fail: () => {
|
||||
locationAuthorize = false;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
wxAppletsLocation(successCallback, errCallback);
|
||||
}
|
||||
// #endif
|
||||
// #ifdef APP-PLUS
|
||||
judgePermission("location", function(result) {
|
||||
if (result == 1) {
|
||||
uni.getLocation({
|
||||
type: 'gcj02',
|
||||
success: res => {
|
||||
// store.commit("setCurrentAddress", {
|
||||
// latitude: res.latitude,
|
||||
// longitude: res.longitude
|
||||
// });
|
||||
successCallback(res);
|
||||
},
|
||||
fail: (err) => {
|
||||
console.log("位置信息错误", err);
|
||||
errCallback("位置信息获取失败");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
// #endif
|
||||
}
|
||||
// export const getAppWxLatLon = function(successCallback, errCallback) {
|
||||
// const _this = this;
|
||||
// // #ifdef MP
|
||||
// if (locationAuthorize) {
|
||||
// uni.authorize({
|
||||
// scope: 'scope.userLocation',
|
||||
// success: () => {
|
||||
// wxAppletsLocation(successCallback, errCallback);
|
||||
// locationAuthorize = false;
|
||||
// },
|
||||
// fail: () => {
|
||||
// locationAuthorize = false;
|
||||
// }
|
||||
// });
|
||||
// } else {
|
||||
// wxAppletsLocation(successCallback, errCallback);
|
||||
// }
|
||||
// // #endif
|
||||
// // #ifdef APP-PLUS
|
||||
// judgePermission("location", function(result) {
|
||||
// if (result == 1) {
|
||||
// uni.getLocation({
|
||||
// type: 'gcj02',
|
||||
// success: res => {
|
||||
// // store.commit("setCurrentAddress", {
|
||||
// // latitude: res.latitude,
|
||||
// // longitude: res.longitude
|
||||
// // });
|
||||
// successCallback(res);
|
||||
// },
|
||||
// fail: (err) => {
|
||||
// console.log("位置信息错误", err);
|
||||
// errCallback("位置信息获取失败");
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
// });
|
||||
// // #endif
|
||||
// }
|
||||
|
||||
//金额过滤
|
||||
Vue.filter('money', function(val) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
40
unpackage/dist/build/app-plus/app-service.js
vendored
40
unpackage/dist/build/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
6
unpackage/dist/build/app-plus/app-view.js
vendored
6
unpackage/dist/build/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/build/app-plus/manifest.json
vendored
2
unpackage/dist/build/app-plus/manifest.json
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
8039
unpackage/dist/dev/app-plus/app-service.js
vendored
8039
unpackage/dist/dev/app-plus/app-service.js
vendored
File diff suppressed because one or more lines are too long
9958
unpackage/dist/dev/app-plus/app-view.js
vendored
9958
unpackage/dist/dev/app-plus/app-view.js
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/dev/app-plus/manifest.json
vendored
2
unpackage/dist/dev/app-plus/manifest.json
vendored
File diff suppressed because one or more lines are too long
2
unpackage/dist/dev/app-plus/view.css
vendored
2
unpackage/dist/dev/app-plus/view.css
vendored
File diff suppressed because one or more lines are too long
4
unpackage/dist/dev/app-plus/view.umd.min.js
vendored
4
unpackage/dist/dev/app-plus/view.umd.min.js
vendored
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user