@tarojs/taro-rn 4.0.0-beta.82 → 4.0.0-beta.83

package/src/lib/gyroscope.ts

@@ -1,83 +1,84 @@
 import { Gyroscope } from 'expo-sensors'
+
 import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
 const _cbManager = createCallbackManager()
 let _listener: any
 
 const intervalMap: any = {
-    game: 20,
-    ui: 60,
-    normal: 200
+  game: 20,
+  ui: 60,
+  normal: 200
 }
 
 /**
  * 开始监听陀螺仪数据
- * @param opts 
+ * @param opts
  * @param {string} [opts.interval='normal'] 监听陀螺仪数据回调函数的执行频率
  */
 function startGyroscope(opts: Taro.startGyroscope.Option = {}): Promise<TaroGeneral.CallbackResult> {
-    const { interval = 'normal', success, fail, complete } = opts
-    const res = { errMsg: 'startGyroscope:ok' }
-    try {
-        // 适配微信小程序行为：重复 start 失败
-        if (_listener) {
-            console.error('startGyroscope:fail')
-            throw new Error('startGyroscope:fail')
-        }
-        _listener = Gyroscope.addListener(e => {
-            _cbManager.trigger(e)
-        })
-        Gyroscope.setUpdateInterval(intervalMap[interval])
-        
-        return successHandler(success, complete)(res)
-    } catch (error) {
-        res.errMsg = 'startGyroscope:fail'
-        return errorHandler(fail, complete)(res)
+  const { interval = 'normal', success, fail, complete } = opts
+  const res = { errMsg: 'startGyroscope:ok' }
+  try {
+    // 适配微信小程序行为：重复 start 失败
+    if (_listener) {
+      console.error('startGyroscope:fail')
+      throw new Error('startGyroscope:fail')
     }
+    _listener = Gyroscope.addListener(e => {
+      _cbManager.trigger(e)
+    })
+    Gyroscope.setUpdateInterval(intervalMap[interval])
+
+    return successHandler(success, complete)(res)
+  } catch (error) {
+    res.errMsg = 'startGyroscope:fail'
+    return errorHandler(fail, complete)(res)
+  }
 }
 
 /**
  * 停止监听陀螺仪数据
- * @param opts 
+ * @param opts
  */
 function stopGyroscope(opts: Taro.stopGyroscope.Option = {}): Promise<TaroGeneral.CallbackResult> {
-    const { success, fail, complete } = opts
-    const res = { errMsg: 'stopGyroscope:ok' }
-    try {
-        _listener && _listener.remove()
-        _listener = null
-        return successHandler(success, complete)(res)
-    } catch (error) {
-        res.errMsg = 'stopGyroscope:fail'
-        return errorHandler(fail, complete)(res)
-    }
+  const { success, fail, complete } = opts
+  const res = { errMsg: 'stopGyroscope:ok' }
+  try {
+    _listener && _listener.remove()
+    _listener = null
+    return successHandler(success, complete)(res)
+  } catch (error) {
+    res.errMsg = 'stopGyroscope:fail'
+    return errorHandler(fail, complete)(res)
+  }
 }
 
 /**
  * 监听陀螺仪数据变化事件
- * @param opts 
+ * @param opts
  */
 function onGyroscopeChange(fnc: Taro.onGyroscopeChange.Callback): void {
-    _cbManager.add(fnc)
+  _cbManager.add(fnc)
 }
 
 /**
  * 取消监听陀螺仪数据变化事件
- * @param opts 
+ * @param opts
  */
 function offGyroscopeChange(fnc?: Taro.onGyroscopeChange.Callback) {
-    if (fnc && typeof fnc === 'function') {
-        _cbManager.remove(fnc)
-    } else if (fnc === undefined) {
-        _cbManager.clear()
-    } else {
-        console.warn('offGyroscopeChange failed')
-    }
+  if (fnc && typeof fnc === 'function') {
+    _cbManager.remove(fnc)
+  } else if (fnc === undefined) {
+    _cbManager.clear()
+  } else {
+    console.warn('offGyroscopeChange failed')
+  }
 }
 
 export {
-    startGyroscope,
-    stopGyroscope,
-    onGyroscopeChange,
-    offGyroscopeChange,
+  offGyroscopeChange,
+  onGyroscopeChange,
+  startGyroscope,
+  stopGyroscope,
 }

package/src/lib/keyboard.ts

@@ -1,4 +1,5 @@
 import { Keyboard } from 'react-native'
+
 import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
 const hideKeyboard = (opts: Taro.hideKeyboard.Option = {}): Promise<TaroGeneral.CallbackResult> => {
@@ -27,8 +28,8 @@ const keyboardHeightListener = (e) => {
 const onKeyboardHeightChange = (callback: Taro.onKeyboardHeightChange.Callback): void => {
   _cbManager.add(callback)
   if (!_hasListener) {
-    Keyboard.addListener("keyboardDidShow", keyboardHeightListener)
-    Keyboard.addListener("keyboardDidHide", keyboardHeightListener)
+    Keyboard.addListener('keyboardDidShow', keyboardHeightListener)
+    Keyboard.addListener('keyboardDidHide', keyboardHeightListener)
     _hasListener = true
   }
 }
@@ -53,7 +54,7 @@ const offKeyboardHeightChange = (callback?: Taro.onKeyboardHeightChange.Callback
 }
 
 export {
-  onKeyboardHeightChange,
+  hideKeyboard,
   offKeyboardHeightChange,
-  hideKeyboard
+  onKeyboardHeightChange
 }

package/src/lib/location.ts

@@ -1,4 +1,5 @@
 import Geolocation from '@react-native-community/geolocation'
+
 import { createCallbackManager, errorHandler, successHandler } from '../utils'
 
 const _cbManager = createCallbackManager()
@@ -20,8 +21,8 @@ export function offLocationChange(callback: Taro.onLocationChange.Callback): voi
 
 /**
  * 开始监听位置信息
- * @param opts 
- * @returns 
+ * @param opts
+ * @returns
  */
 export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = opts
@@ -63,8 +64,8 @@ export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Prom
 
 /**
  * 停止监听位置信息
- * @param opts 
- * @returns 
+ * @param opts
+ * @returns
  */
 export function stopLocationUpdate(opts: Taro.stopLocationUpdate.Option): Promise<TaroGeneral.CallbackResult> {
   const { success, fail, complete } = opts
@@ -79,4 +80,4 @@ export function stopLocationUpdate(opts: Taro.stopLocationUpdate.Option): Promis
 
     return errorHandler(fail, complete)(res)
   }
-}
+}

package/src/lib/makePhoneCall/index.ts

@@ -1,5 +1,6 @@
 import { Linking } from 'react-native'
-import { successHandler, errorHandler } from '../../utils'
+
+import { errorHandler, successHandler } from '../../utils'
 
 export async function makePhoneCall(opts: Taro.makePhoneCall.Option): Promise<TaroGeneral.CallbackResult> {
   const { phoneNumber, success, fail, complete } = opts

package/src/lib/media.ts

@@ -1,14 +1,15 @@
-import { CameraRoll } from "@react-native-camera-roll/camera-roll"
-import { requestCameraPermissionsAsync } from 'expo-camera'
+import { CameraRoll } from '@react-native-camera-roll/camera-roll'
+import { Camera } from 'expo-camera'
 import {
-  requestMediaLibraryPermissionsAsync,
-  launchImageLibraryAsync,
+  ImagePickerAsset,
   launchCameraAsync,
+  launchImageLibraryAsync,
   MediaTypeOptions,
-  ImagePickerAsset,
+  requestMediaLibraryPermissionsAsync,
 } from 'expo-image-picker'
-import { successHandler, errorHandler } from '../utils'
-import { showActionSheet } from "./showActionSheet"
+
+import { errorHandler, successHandler } from '../utils'
+import { showActionSheet } from './showActionSheet'
 
 export const MEDIA_TYPE = MediaTypeOptions
 
@@ -24,7 +25,7 @@ export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.
   const saveType = (type === 'video' || type === 'photo') ? type : 'auto'
   try {
     const url: string = await CameraRoll.save(filePath, { type: saveType })
-    res.path = url;
+    res.path = url
     return successHandler(success, complete)(res)
   } catch (err) {
     res.errMsg = err.message
@@ -39,15 +40,17 @@ async function showPicker(opts: Taro.chooseImage.Option | Taro.chooseVideo.Optio
       itemList: ['拍摄', '从手机相册选择'],
     })
     if (res.tapIndex === 0) {
-      return _chooseMedia({...opts, sourceType: ['camera']}, mediaTypes)
+      return _chooseMedia({ ...opts, sourceType: ['camera'] }, mediaTypes)
     }
     if (res.tapIndex === 1) {
-      return _chooseMedia({...opts, sourceType: ['album']}, mediaTypes)
+      return _chooseMedia({ ...opts, sourceType: ['album'] }, mediaTypes)
     }
   } catch (err) {
-    const res = { errMsg: `choose${
-      mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'
-    } fail` }
+    const res = {
+      errMsg: `choose${
+        mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'
+      } fail`
+    }
     fail?.(res)
     complete?.(res)
   }
@@ -57,12 +60,12 @@ export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVid
   const {
     sourceType = ['album', 'camera'],
   } = opts
-  if(sourceType?.includes('camera') && sourceType?.includes('album')) {
+  if (sourceType?.includes('camera') && sourceType?.includes('album')) {
     return showPicker(opts, mediaTypes)
   } else if (sourceType?.includes('camera')) {
-    return _chooseMedia({...opts, sourceType: ['camera']}, mediaTypes)
+    return _chooseMedia({ ...opts, sourceType: ['camera'] }, mediaTypes)
   }
-  return _chooseMedia({...opts, sourceType: ['album']}, mediaTypes)
+  return _chooseMedia({ ...opts, sourceType: ['album'] }, mediaTypes)
 }
 
 export async function _chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option = {}, mediaTypes: MediaTypeOptions): Promise<TaroGeneral.CallbackResult> {
@@ -85,13 +88,13 @@ export async function _chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVi
   }
   const messString = mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'
   const isCamera = sourceType[0] === 'camera'
-  const { granted } = isCamera ? await requestCameraPermissionsAsync() : await requestMediaLibraryPermissionsAsync()
+  const { granted } = isCamera ? await Camera.requestCameraPermissionsAsync() : await requestMediaLibraryPermissionsAsync()
   if (!granted) {
     const res = { errMsg: 'Permissions denied!' }
     return errorHandler(fail, complete)(res)
   }
 
-  let launchMediaAsync = isCamera ? launchCameraAsync : launchImageLibraryAsync
+  const launchMediaAsync = isCamera ? launchCameraAsync : launchImageLibraryAsync
   try {
     const resp = await launchMediaAsync(options)
     let res: any = {}

package/src/lib/network.ts

@@ -1,16 +1,16 @@
-import NetInfo, { NetInfoStateType, NetInfoState } from '@react-native-community/netinfo'
+import NetInfo, { NetInfoState, NetInfoStateType } from '@react-native-community/netinfo'
 
 let _unsubscribe: any = null
 
-let _callbacks: Set<Function> = new Set()
+const _callbacks: Set<Function> = new Set()
 
 function getTypeFromState(connectionInfo:NetInfoState): keyof Taro.getNetworkType.NetworkType {
   let type: keyof Taro.getNetworkType.NetworkType
-  if(connectionInfo.type === NetInfoStateType.wifi) {
+  if (connectionInfo.type === NetInfoStateType.wifi) {
     type = NetInfoStateType.wifi
-  } else if(connectionInfo.type === NetInfoStateType.cellular && connectionInfo.details.cellularGeneration) {
+  } else if (connectionInfo.type === NetInfoStateType.cellular && connectionInfo.details.cellularGeneration) {
     type = connectionInfo.details.cellularGeneration
-  } else if(connectionInfo.type === NetInfoStateType.none) {
+  } else if (connectionInfo.type === NetInfoStateType.none) {
     type = 'none'
   } else {
     type = 'unknown'

package/src/lib/offLocationChange/index.ts

@@ -1 +1 @@
-export { offLocationChange } from '../location'
+export { offLocationChange } from '../location'

package/src/lib/offUserCaptureScreen/index.ts

@@ -1 +1 @@
-export { offUserCaptureScreen } from '../unsupportedApi'
+export { offUserCaptureScreen } from '../unsupportedApi'

package/src/lib/onLocationChange/index.ts

@@ -1 +1 @@
-export { onLocationChange } from '../location'
+export { onLocationChange } from '../location'

package/src/lib/onUserCaptureScreen/index.ts

@@ -1 +1 @@
-export { onUserCaptureScreen } from '../unsupportedApi'
+export { onUserCaptureScreen } from '../unsupportedApi'

package/src/lib/onWindowResize/index.ts

@@ -1,4 +1,4 @@
-import { callbackManager, addListener } from '../window'
+import { addListener, callbackManager } from '../window'
 
 /**
  * @typedef {Object} WindowResizeParam
@@ -15,4 +15,4 @@ export const onWindowResize = (callback: Taro.onWindowResize.Callback): void =>
   if (callbackManager.count() === 1) {
     addListener()
   }
-}
+}

package/src/lib/openUrl/index.d.ts

@@ -1,24 +1,25 @@
 declare namespace Taro {
-	namespace OpenUrl {
-		interface Option {
-			/** 跳转链接 */
-			url: string
-			/** 接口调用结束的回调函数（调用成功、失败都会执行） */
-			complete?: (res: TaroGeneral.CallbackResult) => void
-			/** 接口调用失败的回调函数 */
-			fail?: (res: TaroGeneral.CallbackResult) => void
-			/** 接口调用成功的回调函数 */
-			success?: (res: TaroGeneral.CallbackResult) => void
-		}
-	}
-	/**
-	 * 由于 Expo 不支持原生的 SDK，所以无法通过集成原生的 SDK 的方式使用微信/支付宝支付。
-	 * 所以 RN 端提供了 `Taro.openUrl({url:''})`的 API 打开手机浏览器，然后走 [手机网站支付](https://docs.open.alipay.com/203/105288/) 的流程。
-	 * @param {Object} opts
-	 * @param {string} [opts.url] 跳转链接
-	 * @param {function} [opts.success] 接口调用成功的回调函数
-	 * @param {function} [opts.fail] 接口调用失败的回调函数
-	 * @param {function} [opts.complete] 接口调用结束的回调函数（调用成功、失败都会执行）
-	 */
-	function openUrl<T>(opts: Taro.OpenUrl.Option): Promise<T>
+  namespace OpenUrl {
+    interface Option {
+      /** 跳转链接 */
+      url: string
+      /** 接口调用结束的回调函数（调用成功、失败都会执行） */
+      complete?: (res: TaroGeneral.CallbackResult) => void
+      /** 接口调用失败的回调函数 */
+      fail?: (res: TaroGeneral.CallbackResult) => void
+      /** 接口调用成功的回调函数 */
+      success?: (res: TaroGeneral.CallbackResult) => void
+    }
+  }
+
+  /**
+   * 由于 Expo 不支持原生的 SDK，所以无法通过集成原生的 SDK 的方式使用微信/支付宝支付。
+   * 所以 RN 端提供了 `Taro.openUrl({url:''})`的 API 打开手机浏览器，然后走 [手机网站支付](https://docs.open.alipay.com/203/105288/) 的流程。
+   * @param {Object} opts
+   * @param {string} [opts.url] 跳转链接
+   * @param {function} [opts.success] 接口调用成功的回调函数
+   * @param {function} [opts.fail] 接口调用失败的回调函数
+   * @param {function} [opts.complete] 接口调用结束的回调函数（调用成功、失败都会执行）
+   */
+  function openUrl<T>(opts: Taro.OpenUrl.Option): Promise<T>
 }

package/src/lib/openUrl/index.ts

@@ -1,5 +1,6 @@
 import { Linking } from 'react-native'
-import { successHandler, errorHandler } from '../../utils'
+
+import { errorHandler, successHandler } from '../../utils'
 
 export async function openUrl <T>(opts: Taro.OpenUrl.Option): Promise<T> {
   const { url, success, fail, complete } = opts || {} as Taro.OpenUrl.Option

package/src/lib/permission.ts

@@ -1,5 +1,4 @@
-import { Linking, AppState, NativeEventSubscription } from 'react-native';
-import { getCameraPermissionsAsync, getMicrophonePermissionsAsync, requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera'
+import { Camera } from 'expo-camera'
 import { getMediaLibraryPermissionsAsync, requestMediaLibraryPermissionsAsync } from 'expo-image-picker'
 import {
   getForegroundPermissionsAsync,
@@ -7,7 +6,16 @@ import {
   requestForegroundPermissionsAsync,
   // requestBackgroundPermissionsAsync
 } from 'expo-location'
-import { errorHandler, successHandler } from '../utils';
+import { AppState, Linking, NativeEventSubscription } from 'react-native'
+
+import { errorHandler, successHandler } from '../utils'
+
+const {
+  getCameraPermissionsAsync,
+  getMicrophonePermissionsAsync,
+  requestCameraPermissionsAsync,
+  requestMicrophonePermissionsAsync
+} = Camera
 
 const scopeMap = {
   'scope.userLocation': [getForegroundPermissionsAsync, requestForegroundPermissionsAsync],
@@ -27,7 +35,7 @@ let stateListener // 缓存监听函数
 let appStateSubscription: NativeEventSubscription | undefined
 
 const getAuthSetting = async () => {
-  let auths = {}
+  const auths = {}
 
   await Promise.all(Object.keys(scopeMap).map(async key => {
     const { granted } = await scopeMap[key][0]()
@@ -47,7 +55,7 @@ const handleAppStateChange = async (_nextAppState, resolve, reject, opts) => {
       res.errMsg = 'openSetting:ok'
       success?.(res)
       complete?.(res)
-  
+
       appStateSubscription?.remove()
       resolve(res)
     } catch (error) {
@@ -59,39 +67,39 @@ const handleAppStateChange = async (_nextAppState, resolve, reject, opts) => {
     }
   }
   // AppState.currentState = nextAppState;
-};
+}
 
 export async function authorize(opts: Taro.authorize.Option): Promise<TaroGeneral.CallbackResult> {
   const { scope, success, fail, complete } = opts
   const res: any = {}
 
-    try {
-      const { granted } = await scopeMap[scope][1]()
-      if (granted) {
-        res.errMsg = 'authorize:ok'
-        return successHandler(success, complete)(res)
-      } else {
-        res.errMsg = 'authorize:denied/undetermined'
-        return errorHandler(fail, complete)(res)
-      }
-    } catch (error) {
-      res.errMsg = 'authorize:fail'
+  try {
+    const { granted } = await scopeMap[scope][1]()
+    if (granted) {
+      res.errMsg = 'authorize:ok'
+      return successHandler(success, complete)(res)
+    } else {
+      res.errMsg = 'authorize:denied/undetermined'
       return errorHandler(fail, complete)(res)
     }
+  } catch (error) {
+    res.errMsg = 'authorize:fail'
+    return errorHandler(fail, complete)(res)
+  }
 }
 
 export async function getSetting(opts: Taro.getSetting.Option = {}): Promise<Taro.getSetting.SuccessCallbackResult> {
   const { success, fail, complete } = opts
   const res: any = {}
 
-    try {
-      res.authSetting = await getAuthSetting()
-      res.errMsg = 'getSetting:ok'
-      return successHandler(success, complete)(res)
-    } catch (error) {
-      res.errMsg = 'getSetting:fail'
-      return errorHandler(fail, complete)(res)
-    }
+  try {
+    res.authSetting = await getAuthSetting()
+    res.errMsg = 'getSetting:ok'
+    return successHandler(success, complete)(res)
+  } catch (error) {
+    res.errMsg = 'getSetting:fail'
+    return errorHandler(fail, complete)(res)
+  }
 }
 
 export function openSetting(opts: Taro.openSetting.Option = {}): Promise<Taro.openSetting.SuccessCallbackResult> {

package/src/lib/previewImage/index.tsx

@@ -1,9 +1,10 @@
 import React from 'react'
-import { View, ActivityIndicator, StyleSheet, Alert, Modal } from 'react-native'
-import RootSiblings from 'react-native-root-siblings'
+import { ActivityIndicator, Alert, Modal, StyleSheet, View } from 'react-native'
 import ImageViewer from 'react-native-image-zoom-viewer'
-import { saveMedia } from '../media'
+import RootSiblings from 'react-native-root-siblings'
+
 import { downloadFile } from '../file'
+import { saveMedia } from '../media'
 
 const styles = StyleSheet.create({
   mask: {

package/src/lib/removeStorageSync/index.ts

@@ -1 +1 @@
-export { removeStorageSync } from '../unsupportedApi'
+export { removeStorageSync } from '../unsupportedApi'

package/src/lib/request/index.ts

@@ -1,4 +1,4 @@
-import { errorHandler, successHandler } from "../../utils"
+import { errorHandler, successHandler } from '../../utils'
 
 function serializeParams(params) {
   if (!params) {
@@ -53,7 +53,7 @@ function _request<T = any>(options: Taro.request.Option): Taro.RequestTask<T> {
   params.method = method
   let controller
   // eslint-disable-next-line no-undef
-  if (typeof(AbortController) !== 'undefined' ) {
+  if (typeof (AbortController) !== 'undefined') {
     // eslint-disable-next-line no-undef
     controller = new AbortController()
     const signal = controller.signal

package/src/lib/scanCode/index.tsx

@@ -1,12 +1,13 @@
-import { initialWindowMetrics } from 'react-native-safe-area-context'
-import { Camera } from 'expo-camera'
 import { BarCodeScanner, requestPermissionsAsync } from 'expo-barcode-scanner'
-import { BackHandler, Image, TouchableOpacity, StyleSheet, View, Dimensions, Platform, StatusBar } from 'react-native'
-import iconClose from './icon_close.png'
-import iconPic from './icon_pic.png'
+import { BarcodeType, CameraView } from 'expo-camera'
+import React from 'react'
+import { BackHandler, Dimensions, Image, Platform, StatusBar, StyleSheet, TouchableOpacity, View } from 'react-native'
 import RootSiblings from 'react-native-root-siblings'
+import { initialWindowMetrics } from 'react-native-safe-area-context'
+
 import { chooseMedia, MEDIA_TYPE } from '../media'
-import React from 'react'
+import iconClose from './icon_close.png'
+import iconPic from './icon_pic.png'
 
 export let scannerView
 
@@ -47,13 +48,15 @@ function findKey (value:string, data, compare = (a, b) => a === b):string {
 
 const { width, height } = Dimensions.get('screen')
 
-function getBarCodeTypes(types:string[]):string[] {
-  const result:string[] = []
+function getBarCodeTypes(types:string[]): BarcodeType[] {
+  const result: BarcodeType[] = []
+
   for (const t of types) {
     result.push(...typeMap[t].map(type => {
       return BarCodeType[type]
     }))
   }
+
   return result.filter(r => !!r)
 }
 
@@ -148,20 +151,20 @@ function scanFromPhoto(callback, errorCallBack) {
 
 export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.scanCode.SuccessCallbackResult> {
   const { success, fail, complete, onlyFromCamera, scanType = ['barCode', 'qrCode'] } = option
-  const { granted } = await requestPermissionsAsync();
+  const { granted } = await requestPermissionsAsync()
   if (!granted) {
     const res = { errMsg: 'Permissions denied!' }
     fail?.(res)
     complete?.(res)
     return Promise.reject(res)
   }
-  const barCodeTypes = getBarCodeTypes(scanType)
+  const barcodeTypes = getBarCodeTypes(scanType)
   return new Promise((resolve, reject) => {
     scannerView = new RootSiblings(
       (<View style={[styles.container]}>
         <StatusBar backgroundColor="rgba(0, 0, 0, 0)" translucent hidden={Platform.OS === 'ios'} />
-        <Camera
-          onBarCodeScanned={({ type, data }: {type: string, data: string}) => {
+        <CameraView
+          onBarcodeScanned={({ type, data }: {type: string, data: string}) => {
             const res = {
               charSet: 'UTF-8', // todo
               path: '', // todo
@@ -175,11 +178,10 @@ export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.
             hide(scannerView)
             resolve(res)
           }}
-          barCodeScannerSettings={{
-            barCodeTypes,
+          barcodeScannerSettings={{
+            barcodeTypes,
           }}
           style={{ width, height }}
-          ratio='16:9'
         />
         <TouchableOpacity accessibilityLabel="Close" style={styles.closeIcon} onPress={() => hide(scannerView)}>
           {safeViewWrapper(<Image source={iconClose} style={styles.closeImg}/>)}

package/src/lib/screen.ts

@@ -1,4 +1,5 @@
 import * as Brightness from 'expo-brightness'
+
 import { errorHandler, shouldBeObject, successHandler } from '../utils'
 
 /**

package/src/lib/setClipboardData/index.ts

@@ -1,6 +1,7 @@
 import Clipboard from '@react-native-clipboard/clipboard'
+
+import { errorHandler, successHandler } from '../../utils'
 import { showToast } from '../showModal/toast'
-import { successHandler, errorHandler } from '../../utils'
 
 export function setClipboardData(opts: Taro.setClipboardData.Option): Promise<Taro.setClipboardData.Promised> {
   const { data, success, fail, complete } = opts
@@ -18,7 +19,7 @@ export function setClipboardData(opts: Taro.setClipboardData.Option): Promise<Ta
     data,
   }
   showToast({
-    icon: "none",
+    icon: 'none',
     title: '内容已复制'
   })
   return successHandler(success, complete)(res)

package/src/lib/setKeepScreenOn/index.ts

@@ -1,5 +1,6 @@
 import { activateKeepAwake, deactivateKeepAwake } from 'expo-keep-awake'
-import { successHandler, errorHandler } from '../../utils'
+
+import { errorHandler, successHandler } from '../../utils'
 
 /**
  * keepScreenOn

package/src/lib/setStorage/index.ts

@@ -1,4 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage'
+
 import { errorHandler, successHandler } from '../../utils'
 
 export async function setStorage(option: Taro.setStorage.Option): Promise<TaroGeneral.CallbackResult> {