uni-auth 1.1.9 → 1.2.1

package/README.md

@@ -0,0 +1,26 @@
+### 使用
+
+1. 引入模块
+
+```
+import { ifUserAuth, AuthPop } from 'uni-auth'
+```
+
+2. 调用方法
+
+ifUserAuth 方法
+
+```
+const res = await ifUserAuth('设备信息', '请授权设备信息xxxx')
+```
+
+//参数1为授权类型，参数2为授权提示信息 参数2可不传用默认提示
+res true为通过授权 false为拒绝授权
+
+AuthPop 组件
+
+```
+<AuthPop />
+```
+
+为授权弹窗组件，用于弹出授权弹窗

package/package.json

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

package/src/common/index.js

@@ -15,8 +15,23 @@ export const contentEnum = {
   },
 }
 
+export 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',
+  },
+}
+
 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 +40,6 @@ export function hintOpenAuth(params = {}) {
       confirmText: platform === 'ios' ? '下一步' : '同意',
       success: (res) => {
         if (!res.confirm) return resolve(false)
-        uni.setStorageSync('authCode', code)
         resolve(true)
         isOpenAuth && uni.openAppAuthorizeSetting()
       },

package/src/components/AuthPop.vue

@@ -1,19 +1,19 @@
 <template>
-  <!-- #ifdef APP -->
+  <!-- #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>
 
 <script setup>
-// #ifdef APP
+// #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,9 +25,8 @@ onMounted(() => {
   if (systemInfo.value.platform !== 'ios') {
     permissionListener.value = uni.createRequestPermissionListener()
     permissionListener.value.onConfirm((e) => {
-      type.value = uni.getStorageSync('authCode') || ''
-      uni.removeStorageSync('authCode')
-      if (type.value) isPermissionAlertShow.value = true
+      list.value = e.map((item) => getPermissionKeyByValue(item))
+      isPermissionAlertShow.value = true
     })
     permissionListener.value.onComplete((e) => {
       isPermissionAlertShow.value = false
@@ -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>
 
@@ -56,7 +65,7 @@ onUnmounted(() => {
   min-height: 120rpx;
   background: #f2f2f2;
   box-shadow: 0 0 10rpx rgba(0, 0, 0, 0.1);
-  z-index: 999;
+  z-index: 999999;
   border-radius: 14rpx;
   margin-left: 5%;
   margin-right: 5%;
@@ -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/index.js

@@ -2,12 +2,12 @@ import { appAuth } from './util/app.js'
 import { wxAuth } from './util/wx.js'
 export { default as AuthPop } from './components/AuthPop.vue'
 
-export async function ifUserAuth(code) {
+export async function ifUserAuth(code, msg) {
   // #ifdef APP-PLUS
-  return await appAuth(code)
+  return await appAuth(code, msg)
   // #endif
   // #ifdef MP-WEIXIN
-  return await wxAuth(code)
+  return await wxAuth(code, msg)
   // #endif
   return true
 }

package/src/util/app.js

@@ -1,21 +1,9 @@
-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',
-  },
-}
-export function appAuth(code = '相册') {
+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
+    if (msg) contentEnum[platform][code] = msg
     if (platform === 'ios') {
       const permissionInfo = uni.getAppAuthorizeSetting()
       const authStatus = permissionInfo[APP[platform][code]]