Commit c5c5fa99 authored by 刘文虎's avatar 刘文虎

修复IOS获取定位权限错误

parent 171cbd32
Pipeline #3372 canceled with stages
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
}, },
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules" : {
"Geolocation" : {},
"OAuth" : {}, "OAuth" : {},
"Payment" : {}, "Payment" : {},
"Push" : {},
"Share" : {}, "Share" : {},
"Geolocation" : {}, "Maps" : {}
"Maps" : {},
"Push" : {}
}, },
"safearea" : { "safearea" : {
"bottom" : { "bottom" : {
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
"permissions" : [ "permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<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_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
...@@ -53,12 +54,14 @@ ...@@ -53,12 +54,14 @@
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
...@@ -93,7 +96,7 @@ ...@@ -93,7 +96,7 @@
}, },
"payment" : { "payment" : {
"weixin" : { "weixin" : {
"__platform__" : [ "android" ], "__platform__" : [ "ios", "android" ],
"appid" : "wxf0a780908851623f", "appid" : "wxf0a780908851623f",
"UniversalLinks" : "https://kaying.cc/uni-universallinks/__UNI__EDB8C7C/" "UniversalLinks" : "https://kaying.cc/uni-universallinks/__UNI__EDB8C7C/"
} }
...@@ -160,9 +163,14 @@ ...@@ -160,9 +163,14 @@
}, },
"splashscreen" : { "splashscreen" : {
"androidStyle" : "default", "androidStyle" : "default",
"iosStyle" : "storyboard", "iosStyle" : "common",
"ios" : { "ios" : {
"storyboard" : "C:/启动页/扳手记账/CustomStoryboard.zip" "storyboard" : "C:/启动页/扳手记账/CustomStoryboard.zip"
},
"android" : {
"hdpi" : "C:/启动页/扳手记账/__480762.9.png",
"xhdpi" : "C:/启动页/扳手记账/__7201242.9.png",
"xxhdpi" : "C:/启动页/扳手记账/__10801882.9.png"
} }
} }
} }
......
...@@ -156,7 +156,7 @@ export default { ...@@ -156,7 +156,7 @@ export default {
}; };
}, },
computed: { computed: {
...mapGetters(['userInfo', 'eyeClose', 'platform', 'canGetLocation']), ...mapGetters(['userInfo', 'eyeClose', 'platform', 'canGetLocation','isIOS']),
baseUrl() { baseUrl() {
return process.uniEnv.qn_base_url; return process.uniEnv.qn_base_url;
}, },
...@@ -280,7 +280,11 @@ export default { ...@@ -280,7 +280,11 @@ export default {
this.shareSuccessTip(); this.shareSuccessTip();
}, },
onReady() { onReady() {
if (this.platform !== '4') { if (this.platform === '4') {
if(this.isIOS){
this.getWeather();
}
}else{
this.getWeather(); this.getWeather();
} }
}, },
...@@ -326,12 +330,13 @@ export default { ...@@ -326,12 +330,13 @@ export default {
await checkOpenPermission(); await checkOpenPermission();
this.getLocation(); this.getLocation();
} catch (e) { } catch (e) {
console.log(e); console.log("getWeather:error",e);
//TODO handle the exception //TODO handle the exception
} }
} }
}, },
getLocation() { getLocation() {
console.log("===getLocation==");
uni.getLocation({ uni.getLocation({
type: 'wgs84', type: 'wgs84',
success: res => { success: res => {
......
...@@ -10,7 +10,7 @@ export function checkOpenPermission() { ...@@ -10,7 +10,7 @@ export function checkOpenPermission() {
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
let result let result
if (isIOS) { if (isIOS) {
result = permision.judgeIosPermissionLocation() result =permision.judgeIosPermission("location")
} else { } else {
result = await permision.requestAndroidPermission( result = await permision.requestAndroidPermission(
'android.permission.ACCESS_FINE_LOCATION'); 'android.permission.ACCESS_FINE_LOCATION');
...@@ -27,7 +27,7 @@ export function checkOpenPermission() { ...@@ -27,7 +27,7 @@ export function checkOpenPermission() {
resolve() resolve()
} else { } else {
console.log("未获得权限"); console.log("未获得权限");
if (result === -1) { if (result === -1||(isIOS&&!result)) {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '请开启位置信息权限', content: '请开启位置信息权限',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment