uni-auth 1.2.0 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-auth",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "main": "src/index.js",
   "type": "module",
   "scripts": {

package/src/common/index.js

@@ -4,6 +4,7 @@ export const contentEnum = {
     相册: `允许${appName}访问您的相册/相机权限来获取您的照片用于上传您的图片和相册等信息`,
     相机: `允许${appName}访问您的相册/相机权限及摄像头来方便用户拍摄上传图片等信息`,
     麦克风: `允许${appName}访问您的麦克风来获取您的声音用于录音等信息`,
+    位置: `允许${appName}访问您的位置，用于为你提供推荐优质房源服务`,
   },
   android: {
     相册: `允许${appName}访问您的相册/相机，您可以上传/拍摄照片及视频；`,
@@ -15,8 +16,25 @@ export const contentEnum = {
   },
 }
 
+export const APP = {
+  ios: {
+    相册: 'albumAuthorized',
+    相机: 'cameraAuthorized',
+    麦克风: 'microphoneAuthorized',
+    位置: 'locationAuthorized',
+  },
+  android: {
+    相册: 'android.permission.WRITE_EXTERNAL_STORAGE',
+    相机: 'android.permission.WRITE_EXTERNAL_STORAGE',
+    麦克风: 'android.permission.RECORD_AUDIO',
+    设备信息: 'android.permission.READ_PHONE_STATE',
+    电话: 'android.permission.CALL_PHONE',
+    位置: 'android.permission.ACCESS_FINE_LOCATION',
+  },
+}
+
 export function hintOpenAuth(params = {}) {
-  const { code, platform = 'android', content = '', isOpenAuth = false } = params || {}
+  const { platform = 'android', content = '', isOpenAuth = false } = params || {}
   return new Promise((resolve, reject) => {
     uni.showModal({
       content,
@@ -25,7 +43,6 @@ export function hintOpenAuth(params = {}) {
       confirmText: platform === 'ios' ? '下一步' : '同意',
       success: (res) => {
         if (!res.confirm) return resolve(false)
-        uni.setStorageSync('applyAuthCode', code)
         resolve(true)
         isOpenAuth && uni.openAppAuthorizeSetting()
       },

package/src/components/AuthPop.vue

@@ -1,8 +1,8 @@
 <template>
   <!-- #ifdef APP-PLUS -->
   <view class="auth-pop" :style="{ marginTop: safeH }" v-if="isPermissionAlertShow">
-    <view class="title">{{ type }}权限使用说明</view>
-    <view class="msg">{{ contentEnum['android'][type] }}</view>
+    <view class="title">{{ list.join('、') }}权限使用说明</view>
+    <view class="msg" v-for="item in list" :key="item">{{ contentEnum['android'][item] }}</view>
   </view>
   <!-- #endif -->
 </template>
@@ -10,10 +10,10 @@
 <script setup>
 // #ifdef APP-PLUS
 import { onMounted, onUnmounted, computed, ref } from 'vue'
-import { contentEnum, safeHeight } from '../common/index.js'
-const type = ref('')
+import { contentEnum, safeHeight, APP } from '../common/index.js'
 const permissionListener = ref(null)
 const isPermissionAlertShow = ref(false)
+const list = ref([])
 const systemInfo = ref(uni.getSystemInfoSync())
 const props = defineProps({
   top: {
@@ -25,12 +25,11 @@ onMounted(() => {
   if (systemInfo.value.platform !== 'ios') {
     permissionListener.value = uni.createRequestPermissionListener()
     permissionListener.value.onConfirm((e) => {
-      type.value = uni.getStorageSync('applyAuthCode') || ''
-      if (type.value) isPermissionAlertShow.value = true
+      list.value = e.map((item) => getPermissionKeyByValue(item))
+      isPermissionAlertShow.value = true
     })
     permissionListener.value.onComplete((e) => {
       isPermissionAlertShow.value = false
-      uni.removeStorageSync('applyAuthCode')
     })
   }
 })
@@ -44,6 +43,16 @@ onUnmounted(() => {
     permissionListener.value.stop()
   }
 })
+
+function getPermissionKeyByValue(permissionValue) {
+  const androidPermissions = APP.android
+  for (const [key, value] of Object.entries(androidPermissions)) {
+    if (value === permissionValue) {
+      return key
+    }
+  }
+  return null
+}
 // #endif
 </script>
 
@@ -75,9 +84,11 @@ onUnmounted(() => {
 .title {
   font-weight: 600;
   font-size: 26rpx;
+  margin-bottom: 20rpx;
 }
 .msg {
   font-size: 24rpx;
   letter-spacing: 2rpx;
+  margin-bottom: 10rpx;
 }
 </style>

package/src/util/app.js

@@ -1,18 +1,5 @@
-import { hintOpenAuth, contentEnum } from '../common/index.js'
-const APP = {
-  ios: {
-    相册: 'albumAuthorized',
-    相机: 'cameraAuthorized',
-    麦克风: 'microphoneAuthorized',
-  },
-  android: {
-    相册: 'android.permission.WRITE_EXTERNAL_STORAGE',
-    相机: 'android.permission.WRITE_EXTERNAL_STORAGE',
-    麦克风: 'android.permission.RECORD_AUDIO',
-    设备信息: 'android.permission.READ_PHONE_STATE',
-    电话: 'android.permission.CALL_PHONE',
-  },
-}
+import { hintOpenAuth, contentEnum, APP } from '../common/index.js'
+
 export function appAuth(code = '相册', msg = '') {
   return new Promise((resolve, reject) => {
     const platform = uni.getSystemInfoSync().platform // ios/android