@tarojs/taro-rn 4.0.0-canary.8 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (194) hide show
  1. package/LICENSE +17 -3
  2. package/apiList.js +31 -31
  3. package/dist/api/index.js +1 -1
  4. package/dist/api/index.js.map +1 -1
  5. package/dist/lib/Mask.js +2 -2
  6. package/dist/lib/Mask.js.map +1 -1
  7. package/dist/lib/Popup.js +20 -13
  8. package/dist/lib/Popup.js.map +1 -1
  9. package/dist/lib/StyleSheet.js +1 -1
  10. package/dist/lib/StyleSheet.js.map +1 -1
  11. package/dist/lib/accelerometer.js +1 -1
  12. package/dist/lib/accelerometer.js.map +1 -1
  13. package/dist/lib/chooseImage/index.js +1 -39
  14. package/dist/lib/chooseImage/index.js.map +1 -1
  15. package/dist/lib/chooseMedia/index.js +19 -0
  16. package/dist/lib/chooseMedia/index.js.map +1 -0
  17. package/dist/lib/chooseVideo/index.js +1 -40
  18. package/dist/lib/chooseVideo/index.js.map +1 -1
  19. package/dist/lib/clearStorage/index.js +2 -2
  20. package/dist/lib/clearStorage/index.js.map +1 -1
  21. package/dist/lib/compressImage/index.js +1 -1
  22. package/dist/lib/compressImage/index.js.map +1 -1
  23. package/dist/lib/connectSocket/index.js.map +1 -1
  24. package/dist/lib/connectSocket/socketTask.js +1 -1
  25. package/dist/lib/connectSocket/socketTask.js.map +1 -1
  26. package/dist/lib/createCameraContext/index.js +3 -3
  27. package/dist/lib/createCameraContext/index.js.map +1 -1
  28. package/dist/lib/createInnerAudioContext/index.js +2 -2
  29. package/dist/lib/createInnerAudioContext/index.js.map +1 -1
  30. package/dist/lib/createVideoContext/index.js +7 -7
  31. package/dist/lib/createVideoContext/index.js.map +1 -1
  32. package/dist/lib/deviceMotion.js +2 -2
  33. package/dist/lib/deviceMotion.js.map +1 -1
  34. package/dist/lib/file.js +4 -4
  35. package/dist/lib/file.js.map +1 -1
  36. package/dist/lib/getAppBaseInfo/index.js +2 -2
  37. package/dist/lib/getAppBaseInfo/index.js.map +1 -1
  38. package/dist/lib/getClipboardData/index.js.map +1 -1
  39. package/dist/lib/getImageInfo/index.js +2 -2
  40. package/dist/lib/getImageInfo/index.js.map +1 -1
  41. package/dist/lib/getLocation/index.js +8 -4
  42. package/dist/lib/getLocation/index.js.map +1 -1
  43. package/dist/lib/getRecorderManager/index.js +5 -5
  44. package/dist/lib/getRecorderManager/index.js.map +1 -1
  45. package/dist/lib/getStorage/index.js.map +1 -1
  46. package/dist/lib/getStorageInfo/index.js +2 -2
  47. package/dist/lib/getStorageInfo/index.js.map +1 -1
  48. package/dist/lib/getSystemInfo/index.js +1 -1
  49. package/dist/lib/getSystemInfo/index.js.map +1 -1
  50. package/dist/lib/getSystemInfoSync/index.js +2 -2
  51. package/dist/lib/getSystemInfoSync/index.js.map +1 -1
  52. package/dist/lib/gyroscope.js +1 -1
  53. package/dist/lib/gyroscope.js.map +1 -1
  54. package/dist/lib/index.js +1 -0
  55. package/dist/lib/index.js.map +1 -1
  56. package/dist/lib/keyboard.js +3 -3
  57. package/dist/lib/keyboard.js.map +1 -1
  58. package/dist/lib/location.js.map +1 -1
  59. package/dist/lib/makePhoneCall/index.js +1 -1
  60. package/dist/lib/makePhoneCall/index.js.map +1 -1
  61. package/dist/lib/media.js +57 -23
  62. package/dist/lib/media.js.map +1 -1
  63. package/dist/lib/network.js +1 -1
  64. package/dist/lib/network.js.map +1 -1
  65. package/dist/lib/offWindowResize/index.js.map +1 -1
  66. package/dist/lib/onWindowResize/index.js +1 -1
  67. package/dist/lib/onWindowResize/index.js.map +1 -1
  68. package/dist/lib/openUrl/index.js +1 -1
  69. package/dist/lib/openUrl/index.js.map +1 -1
  70. package/dist/lib/permission.js +6 -5
  71. package/dist/lib/permission.js.map +1 -1
  72. package/dist/lib/previewImage/index.js +3 -3
  73. package/dist/lib/previewImage/index.js.map +1 -1
  74. package/dist/lib/request/index.js +2 -2
  75. package/dist/lib/request/index.js.map +1 -1
  76. package/dist/lib/scanCode/index.js +23 -23
  77. package/dist/lib/scanCode/index.js.map +1 -1
  78. package/dist/lib/screen.js +2 -2
  79. package/dist/lib/screen.js.map +1 -1
  80. package/dist/lib/setClipboardData/index.js +2 -2
  81. package/dist/lib/setClipboardData/index.js.map +1 -1
  82. package/dist/lib/setKeepScreenOn/index.js +1 -1
  83. package/dist/lib/setKeepScreenOn/index.js.map +1 -1
  84. package/dist/lib/setStorage/index.js.map +1 -1
  85. package/dist/lib/showActionSheet/ActionSheet.js +11 -23
  86. package/dist/lib/showActionSheet/ActionSheet.js.map +1 -1
  87. package/dist/lib/showActionSheet/index.js.map +1 -1
  88. package/dist/lib/showModal/Dialog.js +22 -36
  89. package/dist/lib/showModal/Dialog.js.map +1 -1
  90. package/dist/lib/showModal/index.js.map +1 -1
  91. package/dist/lib/showModal/toast.js +6 -6
  92. package/dist/lib/showModal/toast.js.map +1 -1
  93. package/dist/lib/unsupportedApi.js +2 -4
  94. package/dist/lib/unsupportedApi.js.map +1 -1
  95. package/dist/lib/variable.js +1 -1
  96. package/dist/lib/variable.js.map +1 -1
  97. package/dist/lib/vibrate.js +1 -1
  98. package/dist/lib/vibrate.js.map +1 -1
  99. package/dist/lib/window.js.map +1 -1
  100. package/dist/utils/callbackManager.js.map +1 -1
  101. package/dist/utils/index.js.map +1 -1
  102. package/libList.js +1 -0
  103. package/package.json +67 -61
  104. package/src/api/index.ts +31 -31
  105. package/src/lib/ENV_TYPE/index.ts +1 -1
  106. package/src/lib/Mask.tsx +2 -2
  107. package/src/lib/Popup.tsx +26 -19
  108. package/src/lib/StyleSheet.ts +1 -1
  109. package/src/lib/accelerometer.ts +2 -1
  110. package/src/lib/arrayBufferToBase64/index.ts +1 -1
  111. package/src/lib/base64ToArrayBuffer/index.ts +1 -1
  112. package/src/lib/chooseImage/index.ts +1 -29
  113. package/src/lib/chooseMedia/index.ts +15 -0
  114. package/src/lib/chooseVideo/index.ts +1 -31
  115. package/src/lib/clearStorage/index.ts +1 -0
  116. package/src/lib/clearStorageSync/index.ts +1 -1
  117. package/src/lib/compressImage/index.ts +1 -0
  118. package/src/lib/connectSocket/socketTask.ts +7 -9
  119. package/src/lib/createCameraContext/index.ts +6 -4
  120. package/src/lib/createInnerAudioContext/index.ts +1 -0
  121. package/src/lib/createSelectorQuery/index.ts +1 -1
  122. package/src/lib/deviceMotion.ts +4 -3
  123. package/src/lib/file.ts +10 -9
  124. package/src/lib/getClipboardData/index.ts +1 -0
  125. package/src/lib/getEnv/index.ts +1 -1
  126. package/src/lib/getFileSystemManager/index.ts +1 -1
  127. package/src/lib/getLocation/index.ts +7 -2
  128. package/src/lib/getRecorderManager/index.ts +1 -1
  129. package/src/lib/getStorage/index.ts +1 -0
  130. package/src/lib/getStorageInfo/index.ts +1 -0
  131. package/src/lib/getStorageInfoSync/index.ts +1 -1
  132. package/src/lib/getStorageSync/index.ts +1 -1
  133. package/src/lib/getSystemInfo/index.ts +2 -2
  134. package/src/lib/getSystemInfoSync/index.ts +3 -3
  135. package/src/lib/gyroscope.ts +47 -46
  136. package/src/lib/index.ts +1 -0
  137. package/src/lib/keyboard.ts +5 -4
  138. package/src/lib/location.ts +6 -5
  139. package/src/lib/makePhoneCall/index.ts +2 -1
  140. package/src/lib/media.ts +71 -23
  141. package/src/lib/network.ts +5 -5
  142. package/src/lib/offLocationChange/index.ts +1 -1
  143. package/src/lib/offUserCaptureScreen/index.ts +1 -1
  144. package/src/lib/onLocationChange/index.ts +1 -1
  145. package/src/lib/onUserCaptureScreen/index.ts +1 -1
  146. package/src/lib/onWindowResize/index.ts +2 -2
  147. package/src/lib/openUrl/index.d.ts +23 -22
  148. package/src/lib/openUrl/index.ts +2 -1
  149. package/src/lib/permission.ts +33 -25
  150. package/src/lib/previewImage/index.tsx +4 -3
  151. package/src/lib/removeStorageSync/index.ts +1 -1
  152. package/src/lib/request/index.ts +3 -3
  153. package/src/lib/scanCode/index.tsx +18 -16
  154. package/src/lib/screen.ts +1 -0
  155. package/src/lib/setClipboardData/index.ts +3 -2
  156. package/src/lib/setKeepScreenOn/index.ts +2 -1
  157. package/src/lib/setStorage/index.ts +1 -0
  158. package/src/lib/setStorageSync/index.ts +1 -1
  159. package/src/lib/showActionSheet/ActionSheet.tsx +34 -43
  160. package/src/lib/showActionSheet/index.tsx +1 -0
  161. package/src/lib/showModal/Dialog.tsx +34 -39
  162. package/src/lib/showModal/index.tsx +1 -0
  163. package/src/lib/showModal/toast.tsx +14 -13
  164. package/src/lib/startGyroscope/index.ts +1 -1
  165. package/src/lib/startLocationUpdate/index.ts +1 -1
  166. package/src/lib/unsupportedApi.ts +3 -5
  167. package/src/lib/vibrate.ts +11 -10
  168. package/src/lib/window.ts +3 -2
  169. package/src/utils/callbackManager.ts +5 -5
  170. package/src/utils/index.ts +4 -4
  171. package/types/runtime.d.ts +3 -0
  172. package/{src/types → types}/vue/index.d.ts +2 -3
  173. package/dist/setup.js +0 -58
  174. package/dist/setup.js.map +0 -1
  175. package/src/__tests__/__mock__/mockRNCCameraRoll.js +0 -7
  176. package/src/__tests__/__mock__/mockRNCGeolocation.js +0 -13
  177. package/src/__tests__/__snapshots__/scanCode.test.tsx.snap +0 -154
  178. package/src/__tests__/clipboard.test.ts +0 -88
  179. package/src/__tests__/deviceMotion.test.ts +0 -37
  180. package/src/__tests__/geolocation.test.ts +0 -60
  181. package/src/__tests__/interactive.test.tsx +0 -101
  182. package/src/__tests__/keyboard.test.ts +0 -46
  183. package/src/__tests__/media.test.ts +0 -104
  184. package/src/__tests__/network.test.ts +0 -57
  185. package/src/__tests__/others.test.ts +0 -25
  186. package/src/__tests__/phone.test.ts +0 -31
  187. package/src/__tests__/request.test.ts +0 -146
  188. package/src/__tests__/scanCode.test.tsx +0 -14
  189. package/src/__tests__/storage.test.ts +0 -202
  190. package/src/__tests__/system.test.ts +0 -69
  191. package/src/__tests__/vibrate.test.ts +0 -27
  192. package/src/__tests__/websocket.test.ts +0 -170
  193. package/src/setup.ts +0 -64
  194. /package/{src/types → types}/definition.d.ts +0 -0
@@ -81,7 +81,7 @@ class RecorderManager {
81
81
  playsInSilentModeIOS: true,
82
82
  staysActiveInBackground: false,
83
83
  shouldDuckAndroid: true,
84
- interruptionModeAndroid: 1, //InterruptionModeAndroid.DoNotMix
84
+ interruptionModeAndroid: 1, // InterruptionModeAndroid.DoNotMix
85
85
  playThroughEarpieceAndroid: true
86
86
  } as any)
87
87
 
@@ -1,4 +1,5 @@
1
1
  import AsyncStorage from '@react-native-async-storage/async-storage'
2
+
2
3
  import { errorHandler, successHandler } from '../../utils'
3
4
 
4
5
  export async function getStorage(option: Taro.getStorage.Option<any>): Promise<Taro.getStorage.SuccessCallbackResult<any>> {
@@ -1,4 +1,5 @@
1
1
  import AsyncStorage from '@react-native-async-storage/async-storage'
2
+
2
3
  import { errorHandler, successHandler } from '../../utils'
3
4
 
4
5
  async function getStorageCurrentSize() {
@@ -1 +1 @@
1
- export { getStorageInfoSync } from '../unsupportedApi'
1
+ export { getStorageInfoSync } from '../unsupportedApi'
@@ -1 +1 @@
1
- export { getStorageSync } from '../unsupportedApi'
1
+ export { getStorageSync } from '../unsupportedApi'
@@ -1,7 +1,7 @@
1
+ import { errorHandler, successHandler } from '../../utils'
1
2
  import { getSystemInfoSync } from '../getSystemInfoSync'
2
- import { successHandler, errorHandler } from '../../utils'
3
3
 
4
- export function getSystemInfo(opts: Taro.getSystemInfo.Option = {}): Promise<Taro.getSystemInfo.Result> {
4
+ export function getSystemInfo(opts: Taro.getSystemInfo.Option = {}): Promise<Taro.getSystemInfo.Result> {
5
5
  const { success, fail, complete }: any = opts
6
6
  try {
7
7
  const res = {
@@ -1,11 +1,11 @@
1
1
  import {
2
- Platform,
3
2
  Dimensions,
4
3
  PixelRatio,
4
+ Platform,
5
5
  StatusBar
6
6
  } from 'react-native'
7
- import { initialWindowMetrics } from 'react-native-safe-area-context'
8
7
  import DeviceInfo from 'react-native-device-info'
8
+ import { initialWindowMetrics } from 'react-native-safe-area-context'
9
9
 
10
10
  export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
11
11
  const res: any = {}
@@ -28,7 +28,7 @@ export function getSystemInfoSync(): Taro.getSystemInfoSync.Result {
28
28
  let { top = 0, bottom = 0 } = initialWindowMetrics?.insets || {}
29
29
  // NOTE:android 在沉浸式切换时,有几率top值为0。
30
30
  // https://github.com/th3rdwave/react-native-safe-area-context/issues/364
31
- if(Platform.OS === 'android') { top = StatusBar.currentHeight || 0; }
31
+ if (Platform.OS === 'android') { top = StatusBar.currentHeight || 0 }
32
32
 
33
33
  try {
34
34
  const W = Math.min(screenWidth, screenHeight)
@@ -1,83 +1,84 @@
1
1
  import { Gyroscope } from 'expo-sensors'
2
+
2
3
  import { createCallbackManager, errorHandler, successHandler } from '../utils'
3
4
 
4
5
  const _cbManager = createCallbackManager()
5
6
  let _listener: any
6
7
 
7
8
  const intervalMap: any = {
8
- game: 20,
9
- ui: 60,
10
- normal: 200
9
+ game: 20,
10
+ ui: 60,
11
+ normal: 200
11
12
  }
12
13
 
13
14
  /**
14
15
  * 开始监听陀螺仪数据
15
- * @param opts
16
+ * @param opts
16
17
  * @param {string} [opts.interval='normal'] 监听陀螺仪数据回调函数的执行频率
17
18
  */
18
19
  function startGyroscope(opts: Taro.startGyroscope.Option = {}): Promise<TaroGeneral.CallbackResult> {
19
- const { interval = 'normal', success, fail, complete } = opts
20
- const res = { errMsg: 'startGyroscope:ok' }
21
- try {
22
- // 适配微信小程序行为:重复 start 失败
23
- if (_listener) {
24
- console.error('startGyroscope:fail')
25
- throw new Error('startGyroscope:fail')
26
- }
27
- _listener = Gyroscope.addListener(e => {
28
- _cbManager.trigger(e)
29
- })
30
- Gyroscope.setUpdateInterval(intervalMap[interval])
31
-
32
- return successHandler(success, complete)(res)
33
- } catch (error) {
34
- res.errMsg = 'startGyroscope:fail'
35
- return errorHandler(fail, complete)(res)
20
+ const { interval = 'normal', success, fail, complete } = opts
21
+ const res = { errMsg: 'startGyroscope:ok' }
22
+ try {
23
+ // 适配微信小程序行为:重复 start 失败
24
+ if (_listener) {
25
+ console.error('startGyroscope:fail')
26
+ throw new Error('startGyroscope:fail')
36
27
  }
28
+ _listener = Gyroscope.addListener(e => {
29
+ _cbManager.trigger(e)
30
+ })
31
+ Gyroscope.setUpdateInterval(intervalMap[interval])
32
+
33
+ return successHandler(success, complete)(res)
34
+ } catch (error) {
35
+ res.errMsg = 'startGyroscope:fail'
36
+ return errorHandler(fail, complete)(res)
37
+ }
37
38
  }
38
39
 
39
40
  /**
40
41
  * 停止监听陀螺仪数据
41
- * @param opts
42
+ * @param opts
42
43
  */
43
44
  function stopGyroscope(opts: Taro.stopGyroscope.Option = {}): Promise<TaroGeneral.CallbackResult> {
44
- const { success, fail, complete } = opts
45
- const res = { errMsg: 'stopGyroscope:ok' }
46
- try {
47
- _listener && _listener.remove()
48
- _listener = null
49
- return successHandler(success, complete)(res)
50
- } catch (error) {
51
- res.errMsg = 'stopGyroscope:fail'
52
- return errorHandler(fail, complete)(res)
53
- }
45
+ const { success, fail, complete } = opts
46
+ const res = { errMsg: 'stopGyroscope:ok' }
47
+ try {
48
+ _listener && _listener.remove()
49
+ _listener = null
50
+ return successHandler(success, complete)(res)
51
+ } catch (error) {
52
+ res.errMsg = 'stopGyroscope:fail'
53
+ return errorHandler(fail, complete)(res)
54
+ }
54
55
  }
55
56
 
56
57
  /**
57
58
  * 监听陀螺仪数据变化事件
58
- * @param opts
59
+ * @param opts
59
60
  */
60
61
  function onGyroscopeChange(fnc: Taro.onGyroscopeChange.Callback): void {
61
- _cbManager.add(fnc)
62
+ _cbManager.add(fnc)
62
63
  }
63
64
 
64
65
  /**
65
66
  * 取消监听陀螺仪数据变化事件
66
- * @param opts
67
+ * @param opts
67
68
  */
68
69
  function offGyroscopeChange(fnc?: Taro.onGyroscopeChange.Callback) {
69
- if (fnc && typeof fnc === 'function') {
70
- _cbManager.remove(fnc)
71
- } else if (fnc === undefined) {
72
- _cbManager.clear()
73
- } else {
74
- console.warn('offGyroscopeChange failed')
75
- }
70
+ if (fnc && typeof fnc === 'function') {
71
+ _cbManager.remove(fnc)
72
+ } else if (fnc === undefined) {
73
+ _cbManager.clear()
74
+ } else {
75
+ console.warn('offGyroscopeChange failed')
76
+ }
76
77
  }
77
78
 
78
79
  export {
79
- startGyroscope,
80
- stopGyroscope,
81
- onGyroscopeChange,
82
- offGyroscopeChange,
80
+ offGyroscopeChange,
81
+ onGyroscopeChange,
82
+ startGyroscope,
83
+ stopGyroscope,
83
84
  }
package/src/lib/index.ts CHANGED
@@ -5,6 +5,7 @@ export * from './authorize'
5
5
  export * from './base64ToArrayBuffer'
6
6
  export * from './canIUse'
7
7
  export * from './chooseImage'
8
+ export * from './chooseMedia'
8
9
  export * from './chooseVideo'
9
10
  export * from './clearStorage'
10
11
  export * from './clearStorageSync'
@@ -1,4 +1,5 @@
1
1
  import { Keyboard } from 'react-native'
2
+
2
3
  import { createCallbackManager, errorHandler, successHandler } from '../utils'
3
4
 
4
5
  const hideKeyboard = (opts: Taro.hideKeyboard.Option = {}): Promise<TaroGeneral.CallbackResult> => {
@@ -27,8 +28,8 @@ const keyboardHeightListener = (e) => {
27
28
  const onKeyboardHeightChange = (callback: Taro.onKeyboardHeightChange.Callback): void => {
28
29
  _cbManager.add(callback)
29
30
  if (!_hasListener) {
30
- Keyboard.addListener("keyboardDidShow", keyboardHeightListener)
31
- Keyboard.addListener("keyboardDidHide", keyboardHeightListener)
31
+ Keyboard.addListener('keyboardDidShow', keyboardHeightListener)
32
+ Keyboard.addListener('keyboardDidHide', keyboardHeightListener)
32
33
  _hasListener = true
33
34
  }
34
35
  }
@@ -53,7 +54,7 @@ const offKeyboardHeightChange = (callback?: Taro.onKeyboardHeightChange.Callback
53
54
  }
54
55
 
55
56
  export {
56
- onKeyboardHeightChange,
57
+ hideKeyboard,
57
58
  offKeyboardHeightChange,
58
- hideKeyboard
59
+ onKeyboardHeightChange
59
60
  }
@@ -1,4 +1,5 @@
1
1
  import Geolocation from '@react-native-community/geolocation'
2
+
2
3
  import { createCallbackManager, errorHandler, successHandler } from '../utils'
3
4
 
4
5
  const _cbManager = createCallbackManager()
@@ -20,8 +21,8 @@ export function offLocationChange(callback: Taro.onLocationChange.Callback): voi
20
21
 
21
22
  /**
22
23
  * 开始监听位置信息
23
- * @param opts
24
- * @returns
24
+ * @param opts
25
+ * @returns
25
26
  */
26
27
  export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Promise<TaroGeneral.CallbackResult> {
27
28
  const { success, fail, complete } = opts
@@ -63,8 +64,8 @@ export function startLocationUpdate(opts: Taro.startLocationUpdate.Option): Prom
63
64
 
64
65
  /**
65
66
  * 停止监听位置信息
66
- * @param opts
67
- * @returns
67
+ * @param opts
68
+ * @returns
68
69
  */
69
70
  export function stopLocationUpdate(opts: Taro.stopLocationUpdate.Option): Promise<TaroGeneral.CallbackResult> {
70
71
  const { success, fail, complete } = opts
@@ -79,4 +80,4 @@ export function stopLocationUpdate(opts: Taro.stopLocationUpdate.Option): Promis
79
80
 
80
81
  return errorHandler(fail, complete)(res)
81
82
  }
82
- }
83
+ }
@@ -1,5 +1,6 @@
1
1
  import { Linking } from 'react-native'
2
- import { successHandler, errorHandler } from '../../utils'
2
+
3
+ import { errorHandler, successHandler } from '../../utils'
3
4
 
4
5
  export async function makePhoneCall(opts: Taro.makePhoneCall.Option): Promise<TaroGeneral.CallbackResult> {
5
6
  const { phoneNumber, success, fail, complete } = opts
package/src/lib/media.ts CHANGED
@@ -1,16 +1,21 @@
1
- import { CameraRoll } from "@react-native-camera-roll/camera-roll"
2
- import { requestCameraPermissionsAsync } from 'expo-camera'
3
- import * as ImagePicker from 'expo-image-picker'
4
- import { successHandler, errorHandler } from '../utils'
1
+ import { CameraRoll } from '@react-native-camera-roll/camera-roll'
2
+ import { Camera } from 'expo-camera'
3
+ import {
4
+ ImagePickerAsset,
5
+ launchCameraAsync,
6
+ launchImageLibraryAsync,
7
+ MediaTypeOptions,
8
+ requestMediaLibraryPermissionsAsync,
9
+ } from 'expo-image-picker'
5
10
 
6
- export const MEDIA_TYPE = {
7
- VIDEOS: 'Videos',
8
- IMAGES: 'Images'
9
- }
11
+ import { errorHandler, successHandler } from '../utils'
12
+ import { showActionSheet } from './showActionSheet'
13
+
14
+ export const MEDIA_TYPE = MediaTypeOptions
10
15
 
11
16
  export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.saveVideoToPhotosAlbum.Option, type:string, API:string):Promise<TaroGeneral.CallbackResult> {
12
17
  const { filePath, success, fail, complete } = opts
13
- const { granted } = await ImagePicker.requestMediaLibraryPermissionsAsync()
18
+ const { granted } = await requestMediaLibraryPermissionsAsync()
14
19
  if (!granted) {
15
20
  const res = { errMsg: 'Permissions denied!' }
16
21
  return errorHandler(fail, complete)(res)
@@ -20,7 +25,7 @@ export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.
20
25
  const saveType = (type === 'video' || type === 'photo') ? type : 'auto'
21
26
  try {
22
27
  const url: string = await CameraRoll.save(filePath, { type: saveType })
23
- res.path = url;
28
+ res.path = url
24
29
  return successHandler(success, complete)(res)
25
30
  } catch (err) {
26
31
  res.errMsg = err.message
@@ -28,30 +33,72 @@ export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.
28
33
  }
29
34
  }
30
35
 
31
- export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option, mediaTypes: any): Promise<TaroGeneral.CallbackResult> {
32
- if (!opts || typeof opts !== 'object') {
33
- opts = {}
36
+ async function showPicker(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option, mediaTypes: MediaTypeOptions):Promise<any> {
37
+ const { fail, complete } = opts
38
+ try {
39
+ const res = await showActionSheet({
40
+ itemList: ['拍摄', '从手机相册选择'],
41
+ })
42
+ if (res.tapIndex === 0) {
43
+ return _chooseMedia({ ...opts, sourceType: ['camera'] }, mediaTypes)
44
+ }
45
+ if (res.tapIndex === 1) {
46
+ return _chooseMedia({ ...opts, sourceType: ['album'] }, mediaTypes)
47
+ }
48
+ } catch (err) {
49
+ const res = {
50
+ errMsg: `choose${
51
+ mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'
52
+ } fail`
53
+ }
54
+ fail?.(res)
55
+ complete?.(res)
56
+ }
57
+ }
58
+
59
+ export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option = {}, mediaTypes: MediaTypeOptions): Promise<TaroGeneral.CallbackResult> {
60
+ const {
61
+ sourceType = ['album', 'camera'],
62
+ } = opts
63
+ if (sourceType?.includes('camera') && sourceType?.includes('album')) {
64
+ return showPicker(opts, mediaTypes)
65
+ } else if (sourceType?.includes('camera')) {
66
+ return _chooseMedia({ ...opts, sourceType: ['camera'] }, mediaTypes)
34
67
  }
35
- const { sizeType = [], sourceType = [], success, fail, complete, maxDuration, count } = opts as any
68
+ return _chooseMedia({ ...opts, sourceType: ['album'] }, mediaTypes)
69
+ }
70
+
71
+ export async function _chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVideo.Option | Taro.chooseMedia.Option = {}, mediaTypes: MediaTypeOptions): Promise<TaroGeneral.CallbackResult> {
72
+ const {
73
+ sizeType = [],
74
+ sourceType = [],
75
+ success,
76
+ fail,
77
+ complete,
78
+ maxDuration,
79
+ count = (mediaTypes === MEDIA_TYPE.Videos ? 1 : 9),
80
+ compressed
81
+ } = opts as any
36
82
  const options = {
37
83
  mediaTypes,
38
- quality: sizeType[0] === 'compressed' ? 0.7 : 1,
84
+ quality: (sizeType[0] === 'compressed' || compressed) ? 0.7 : 1,
39
85
  videoMaxDuration: maxDuration,
40
- allowsMultipleSelection: (mediaTypes === MEDIA_TYPE.IMAGES && count > 1) ? true : false,
41
- selectionLimit: mediaTypes === MEDIA_TYPE.VIDEOS ? 1 : (count || 9),
86
+ allowsMultipleSelection: count > 1,
87
+ selectionLimit: count,
42
88
  }
89
+ const messString = mediaTypes === MediaTypeOptions.Images ? 'Image' : mediaTypes === MediaTypeOptions.Videos ? 'Video' : 'Media'
43
90
  const isCamera = sourceType[0] === 'camera'
44
- const { granted } = isCamera ? await requestCameraPermissionsAsync() : await ImagePicker.requestMediaLibraryPermissionsAsync()
91
+ const { granted } = isCamera ? await Camera.requestCameraPermissionsAsync() : await requestMediaLibraryPermissionsAsync()
45
92
  if (!granted) {
46
93
  const res = { errMsg: 'Permissions denied!' }
47
94
  return errorHandler(fail, complete)(res)
48
95
  }
49
96
 
50
- let launchMediaAsync = isCamera ? ImagePicker.launchCameraAsync : ImagePicker.launchImageLibraryAsync
97
+ const launchMediaAsync = isCamera ? launchCameraAsync : launchImageLibraryAsync
51
98
  try {
52
99
  const resp = await launchMediaAsync(options)
53
100
  let res: any = {}
54
- if (mediaTypes === MEDIA_TYPE.VIDEOS) {
101
+ if (mediaTypes === MEDIA_TYPE.Videos) {
55
102
  const asset = resp.assets?.[0]
56
103
  res = {
57
104
  ...asset,
@@ -61,11 +108,12 @@ export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVid
61
108
  } else {
62
109
  res = {
63
110
  tempFilePaths: resp.assets?.map((item) => item.uri),
64
- tempFiles: resp.assets?.map((item) => ({
111
+ tempFiles: resp.assets?.map((item: ImagePickerAsset) => ({
65
112
  ...item,
66
113
  path: item.uri,
67
114
  size: item.fileSize,
68
115
  type: item.mimeType,
116
+ fileType: item.mimeType?.startsWith('video') ? 'video' : 'image',
69
117
  }))
70
118
  }
71
119
  }
@@ -73,13 +121,13 @@ export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVid
73
121
  return successHandler(success, complete)(res)
74
122
  } else {
75
123
  const res = {
76
- errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo:fail cancel' : 'chooseImage:fail cancel',
124
+ errMsg: `choose${messString}:fail cancel`
77
125
  }
78
126
  return errorHandler(fail, complete)(res)
79
127
  }
80
128
  } catch (err) {
81
129
  const res = {
82
- errMsg: mediaTypes === MEDIA_TYPE.VIDEOS ? 'chooseVideo fail' : 'chooseImage fail',
130
+ errMsg: `choose${messString}:fail`,
83
131
  err
84
132
  }
85
133
  return errorHandler(fail, complete)(res)
@@ -1,16 +1,16 @@
1
- import NetInfo, { NetInfoStateType, NetInfoState } from '@react-native-community/netinfo'
1
+ import NetInfo, { NetInfoState, NetInfoStateType } from '@react-native-community/netinfo'
2
2
 
3
3
  let _unsubscribe: any = null
4
4
 
5
- let _callbacks: Set<Function> = new Set()
5
+ const _callbacks: Set<Function> = new Set()
6
6
 
7
7
  function getTypeFromState(connectionInfo:NetInfoState): keyof Taro.getNetworkType.NetworkType {
8
8
  let type: keyof Taro.getNetworkType.NetworkType
9
- if(connectionInfo.type === NetInfoStateType.wifi) {
9
+ if (connectionInfo.type === NetInfoStateType.wifi) {
10
10
  type = NetInfoStateType.wifi
11
- } else if(connectionInfo.type === NetInfoStateType.cellular && connectionInfo.details.cellularGeneration) {
11
+ } else if (connectionInfo.type === NetInfoStateType.cellular && connectionInfo.details.cellularGeneration) {
12
12
  type = connectionInfo.details.cellularGeneration
13
- } else if(connectionInfo.type === NetInfoStateType.none) {
13
+ } else if (connectionInfo.type === NetInfoStateType.none) {
14
14
  type = 'none'
15
15
  } else {
16
16
  type = 'unknown'
@@ -1 +1 @@
1
- export { offLocationChange } from '../location'
1
+ export { offLocationChange } from '../location'
@@ -1 +1 @@
1
- export { offUserCaptureScreen } from '../unsupportedApi'
1
+ export { offUserCaptureScreen } from '../unsupportedApi'
@@ -1 +1 @@
1
- export { onLocationChange } from '../location'
1
+ export { onLocationChange } from '../location'
@@ -1 +1 @@
1
- export { onUserCaptureScreen } from '../unsupportedApi'
1
+ export { onUserCaptureScreen } from '../unsupportedApi'
@@ -1,4 +1,4 @@
1
- import { callbackManager, addListener } from '../window'
1
+ import { addListener, callbackManager } from '../window'
2
2
 
3
3
  /**
4
4
  * @typedef {Object} WindowResizeParam
@@ -15,4 +15,4 @@ export const onWindowResize = (callback: Taro.onWindowResize.Callback): void =>
15
15
  if (callbackManager.count() === 1) {
16
16
  addListener()
17
17
  }
18
- }
18
+ }
@@ -1,24 +1,25 @@
1
1
  declare namespace Taro {
2
- namespace OpenUrl {
3
- interface Option {
4
- /** 跳转链接 */
5
- url: string
6
- /** 接口调用结束的回调函数(调用成功、失败都会执行) */
7
- complete?: (res: TaroGeneral.CallbackResult) => void
8
- /** 接口调用失败的回调函数 */
9
- fail?: (res: TaroGeneral.CallbackResult) => void
10
- /** 接口调用成功的回调函数 */
11
- success?: (res: TaroGeneral.CallbackResult) => void
12
- }
13
- }
14
- /**
15
- * 由于 Expo 不支持原生的 SDK,所以无法通过集成原生的 SDK 的方式使用微信/支付宝支付。
16
- * 所以 RN 端提供了 `Taro.openUrl({url:''})`的 API 打开手机浏览器,然后走 [手机网站支付](https://docs.open.alipay.com/203/105288/) 的流程。
17
- * @param {Object} opts
18
- * @param {string} [opts.url] 跳转链接
19
- * @param {function} [opts.success] 接口调用成功的回调函数
20
- * @param {function} [opts.fail] 接口调用失败的回调函数
21
- * @param {function} [opts.complete] 接口调用结束的回调函数(调用成功、失败都会执行)
22
- */
23
- function openUrl<T>(opts: Taro.OpenUrl.Option): Promise<T>
2
+ namespace OpenUrl {
3
+ interface Option {
4
+ /** 跳转链接 */
5
+ url: string
6
+ /** 接口调用结束的回调函数(调用成功、失败都会执行) */
7
+ complete?: (res: TaroGeneral.CallbackResult) => void
8
+ /** 接口调用失败的回调函数 */
9
+ fail?: (res: TaroGeneral.CallbackResult) => void
10
+ /** 接口调用成功的回调函数 */
11
+ success?: (res: TaroGeneral.CallbackResult) => void
12
+ }
13
+ }
14
+
15
+ /**
16
+ * 由于 Expo 不支持原生的 SDK,所以无法通过集成原生的 SDK 的方式使用微信/支付宝支付。
17
+ * 所以 RN 端提供了 `Taro.openUrl({url:''})`的 API 打开手机浏览器,然后走 [手机网站支付](https://docs.open.alipay.com/203/105288/) 的流程。
18
+ * @param {Object} opts
19
+ * @param {string} [opts.url] 跳转链接
20
+ * @param {function} [opts.success] 接口调用成功的回调函数
21
+ * @param {function} [opts.fail] 接口调用失败的回调函数
22
+ * @param {function} [opts.complete] 接口调用结束的回调函数(调用成功、失败都会执行)
23
+ */
24
+ function openUrl<T>(opts: Taro.OpenUrl.Option): Promise<T>
24
25
  }
@@ -1,5 +1,6 @@
1
1
  import { Linking } from 'react-native'
2
- import { successHandler, errorHandler } from '../../utils'
2
+
3
+ import { errorHandler, successHandler } from '../../utils'
3
4
 
4
5
  export async function openUrl <T>(opts: Taro.OpenUrl.Option): Promise<T> {
5
6
  const { url, success, fail, complete } = opts || {} as Taro.OpenUrl.Option
@@ -1,5 +1,4 @@
1
- import { Linking, AppState, NativeEventSubscription } from 'react-native';
2
- import { getCameraPermissionsAsync, getMicrophonePermissionsAsync, requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera'
1
+ import { Camera } from 'expo-camera'
3
2
  import { getMediaLibraryPermissionsAsync, requestMediaLibraryPermissionsAsync } from 'expo-image-picker'
4
3
  import {
5
4
  getForegroundPermissionsAsync,
@@ -7,7 +6,16 @@ import {
7
6
  requestForegroundPermissionsAsync,
8
7
  // requestBackgroundPermissionsAsync
9
8
  } from 'expo-location'
10
- import { errorHandler, successHandler } from '../utils';
9
+ import { AppState, Linking, NativeEventSubscription } from 'react-native'
10
+
11
+ import { errorHandler, successHandler } from '../utils'
12
+
13
+ const {
14
+ getCameraPermissionsAsync,
15
+ getMicrophonePermissionsAsync,
16
+ requestCameraPermissionsAsync,
17
+ requestMicrophonePermissionsAsync
18
+ } = Camera
11
19
 
12
20
  const scopeMap = {
13
21
  'scope.userLocation': [getForegroundPermissionsAsync, requestForegroundPermissionsAsync],
@@ -27,7 +35,7 @@ let stateListener // 缓存监听函数
27
35
  let appStateSubscription: NativeEventSubscription | undefined
28
36
 
29
37
  const getAuthSetting = async () => {
30
- let auths = {}
38
+ const auths = {}
31
39
 
32
40
  await Promise.all(Object.keys(scopeMap).map(async key => {
33
41
  const { granted } = await scopeMap[key][0]()
@@ -47,7 +55,7 @@ const handleAppStateChange = async (_nextAppState, resolve, reject, opts) => {
47
55
  res.errMsg = 'openSetting:ok'
48
56
  success?.(res)
49
57
  complete?.(res)
50
-
58
+
51
59
  appStateSubscription?.remove()
52
60
  resolve(res)
53
61
  } catch (error) {
@@ -59,39 +67,39 @@ const handleAppStateChange = async (_nextAppState, resolve, reject, opts) => {
59
67
  }
60
68
  }
61
69
  // AppState.currentState = nextAppState;
62
- };
70
+ }
63
71
 
64
72
  export async function authorize(opts: Taro.authorize.Option): Promise<TaroGeneral.CallbackResult> {
65
73
  const { scope, success, fail, complete } = opts
66
74
  const res: any = {}
67
75
 
68
- try {
69
- const { granted } = await scopeMap[scope][1]()
70
- if (granted) {
71
- res.errMsg = 'authorize:ok'
72
- return successHandler(success, complete)(res)
73
- } else {
74
- res.errMsg = 'authorize:denied/undetermined'
75
- return errorHandler(fail, complete)(res)
76
- }
77
- } catch (error) {
78
- res.errMsg = 'authorize:fail'
76
+ try {
77
+ const { granted } = await scopeMap[scope][1]()
78
+ if (granted) {
79
+ res.errMsg = 'authorize:ok'
80
+ return successHandler(success, complete)(res)
81
+ } else {
82
+ res.errMsg = 'authorize:denied/undetermined'
79
83
  return errorHandler(fail, complete)(res)
80
84
  }
85
+ } catch (error) {
86
+ res.errMsg = 'authorize:fail'
87
+ return errorHandler(fail, complete)(res)
88
+ }
81
89
  }
82
90
 
83
91
  export async function getSetting(opts: Taro.getSetting.Option = {}): Promise<Taro.getSetting.SuccessCallbackResult> {
84
92
  const { success, fail, complete } = opts
85
93
  const res: any = {}
86
94
 
87
- try {
88
- res.authSetting = await getAuthSetting()
89
- res.errMsg = 'getSetting:ok'
90
- return successHandler(success, complete)(res)
91
- } catch (error) {
92
- res.errMsg = 'getSetting:fail'
93
- return errorHandler(fail, complete)(res)
94
- }
95
+ try {
96
+ res.authSetting = await getAuthSetting()
97
+ res.errMsg = 'getSetting:ok'
98
+ return successHandler(success, complete)(res)
99
+ } catch (error) {
100
+ res.errMsg = 'getSetting:fail'
101
+ return errorHandler(fail, complete)(res)
102
+ }
95
103
  }
96
104
 
97
105
  export function openSetting(opts: Taro.openSetting.Option = {}): Promise<Taro.openSetting.SuccessCallbackResult> {
@@ -1,9 +1,10 @@
1
1
  import React from 'react'
2
- import { View, ActivityIndicator, StyleSheet, Alert, Modal } from 'react-native'
3
- import RootSiblings from 'react-native-root-siblings'
2
+ import { ActivityIndicator, Alert, Modal, StyleSheet, View } from 'react-native'
4
3
  import ImageViewer from 'react-native-image-zoom-viewer'
5
- import { saveMedia } from '../media'
4
+ import RootSiblings from 'react-native-root-siblings'
5
+
6
6
  import { downloadFile } from '../file'
7
+ import { saveMedia } from '../media'
7
8
 
8
9
  const styles = StyleSheet.create({
9
10
  mask: {