@tarojs/taro-rn 3.5.0-alpha.9 → 3.5.0-beta.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.
- package/dist/lib/createCameraContext/index.js +38 -28
- package/dist/lib/createCameraContext/index.js.map +1 -1
- package/dist/lib/createInnerAudioContext/index.js +2 -2
- package/dist/lib/createInnerAudioContext/index.js.map +1 -1
- package/dist/lib/getLocation/index.js +3 -4
- package/dist/lib/getLocation/index.js.map +1 -1
- package/dist/lib/getRecorderManager/index.js +6 -10
- package/dist/lib/getRecorderManager/index.js.map +1 -1
- package/dist/lib/media.js +5 -6
- package/dist/lib/media.js.map +1 -1
- package/dist/lib/permission.js +18 -17
- package/dist/lib/permission.js.map +1 -1
- package/dist/lib/scanCode/index.js +4 -6
- package/dist/lib/scanCode/index.js.map +1 -1
- package/dist/setup.js +18 -2
- package/dist/setup.js.map +1 -1
- package/package.json +22 -24
- package/src/__tests__/__snapshots__/scanCode.test.js.snap +5 -5
- package/src/__tests__/scanCode.test.js +0 -1
- package/src/lib/createCameraContext/index.ts +30 -21
- package/src/lib/createInnerAudioContext/index.ts +2 -2
- package/src/lib/getLocation/index.ts +3 -4
- package/src/lib/getRecorderManager/index.ts +6 -10
- package/src/lib/media.ts +5 -6
- package/src/lib/permission.ts +21 -17
- package/src/lib/scanCode/index.tsx +3 -6
- package/src/setup.ts +22 -3
- package/dist/utils/premissions.js +0 -17
- package/dist/utils/premissions.js.map +0 -1
- package/src/__tests__/__mock__/mockExpoPermissions.js +0 -8
- package/src/utils/premissions.ts +0 -6
|
@@ -7,8 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
|
-
import * as Permissions from 'expo-permissions';
|
|
11
10
|
import { errorHandler, successHandler } from '../../utils';
|
|
11
|
+
import { requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera';
|
|
12
12
|
const globalAny = global;
|
|
13
13
|
class CameraContext {
|
|
14
14
|
constructor(cameraRef) {
|
|
@@ -16,34 +16,44 @@ class CameraContext {
|
|
|
16
16
|
* 开始录像
|
|
17
17
|
*/
|
|
18
18
|
this.startRecord = (option) => {
|
|
19
|
-
|
|
20
|
-
var _a, _b, _c;
|
|
21
|
-
(
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
19
|
+
Promise.all([requestCameraPermissionsAsync(), requestMicrophonePermissionsAsync()]).then(([cameraPermission, microphonePermission]) => {
|
|
20
|
+
var _a, _b, _c, _d, _e;
|
|
21
|
+
if (cameraPermission.granted && microphonePermission.granted) {
|
|
22
|
+
(_a = this.cameraRef) === null || _a === void 0 ? void 0 : _a.recordAsync().then((res) => {
|
|
23
|
+
var _a, _b;
|
|
24
|
+
const { uri } = res;
|
|
25
|
+
const result = {
|
|
26
|
+
tempVideoPath: uri,
|
|
27
|
+
tempThumbPath: '',
|
|
28
|
+
errMsg: 'stopRecord: ok'
|
|
29
|
+
};
|
|
30
|
+
(_b = (_a = this.recordCallback) === null || _a === void 0 ? void 0 : _a.success) === null || _b === void 0 ? void 0 : _b.call(_a, result);
|
|
31
|
+
}).catch((e) => {
|
|
32
|
+
var _a, _b, _c, _d;
|
|
33
|
+
const res = {
|
|
34
|
+
errMsg: e.message
|
|
35
|
+
};
|
|
36
|
+
(_a = option === null || option === void 0 ? void 0 : option.fail) === null || _a === void 0 ? void 0 : _a.call(option, res);
|
|
37
|
+
(_b = option === null || option === void 0 ? void 0 : option.complete) === null || _b === void 0 ? void 0 : _b.call(option, res);
|
|
38
|
+
(_d = (_c = this.recordCallback) === null || _c === void 0 ? void 0 : _c.fail) === null || _d === void 0 ? void 0 : _d.call(_c, { errMsg: e });
|
|
39
|
+
}).finally(() => {
|
|
40
|
+
var _a, _b;
|
|
41
|
+
(_b = (_a = this.recordCallback) === null || _a === void 0 ? void 0 : _a.complete) === null || _b === void 0 ? void 0 : _b.call(_a, { errMsg: '' });
|
|
42
|
+
});
|
|
43
|
+
const res = {
|
|
44
|
+
errMsg: 'startRecord: ok'
|
|
28
45
|
};
|
|
29
|
-
(_b =
|
|
30
|
-
|
|
31
|
-
|
|
46
|
+
(_b = option === null || option === void 0 ? void 0 : option.success) === null || _b === void 0 ? void 0 : _b.call(option, res);
|
|
47
|
+
(_c = option === null || option === void 0 ? void 0 : option.complete) === null || _c === void 0 ? void 0 : _c.call(option, res);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
32
50
|
const res = {
|
|
33
|
-
errMsg:
|
|
51
|
+
errMsg: 'startRecord: fail',
|
|
52
|
+
err: Error('You have not enabled camera or microphone permissions')
|
|
34
53
|
};
|
|
35
|
-
(
|
|
36
|
-
(
|
|
37
|
-
|
|
38
|
-
}).finally(() => {
|
|
39
|
-
var _a, _b;
|
|
40
|
-
(_b = (_a = this.recordCallback) === null || _a === void 0 ? void 0 : _a.complete) === null || _b === void 0 ? void 0 : _b.call(_a, { errMsg: '' });
|
|
41
|
-
});
|
|
42
|
-
const res = {
|
|
43
|
-
errMsg: 'startRecord: ok'
|
|
44
|
-
};
|
|
45
|
-
(_b = option === null || option === void 0 ? void 0 : option.success) === null || _b === void 0 ? void 0 : _b.call(option, res);
|
|
46
|
-
(_c = option === null || option === void 0 ? void 0 : option.complete) === null || _c === void 0 ? void 0 : _c.call(option, res);
|
|
54
|
+
(_d = option === null || option === void 0 ? void 0 : option.fail) === null || _d === void 0 ? void 0 : _d.call(option, res);
|
|
55
|
+
(_e = option === null || option === void 0 ? void 0 : option.complete) === null || _e === void 0 ? void 0 : _e.call(option, res);
|
|
56
|
+
}
|
|
47
57
|
});
|
|
48
58
|
};
|
|
49
59
|
/**
|
|
@@ -73,8 +83,8 @@ class CameraContext {
|
|
|
73
83
|
break;
|
|
74
84
|
}
|
|
75
85
|
try {
|
|
76
|
-
const {
|
|
77
|
-
if (
|
|
86
|
+
const { granted } = yield requestCameraPermissionsAsync();
|
|
87
|
+
if (granted) {
|
|
78
88
|
if ((_a = this.cameraRef) === null || _a === void 0 ? void 0 : _a.takePictureAsync) {
|
|
79
89
|
const { uri } = yield this.cameraRef.takePictureAsync({ quality: _quality });
|
|
80
90
|
const res = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/createCameraContext/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/createCameraContext/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,10 +114,10 @@ class InnerAudioContext {
|
|
|
114
114
|
yield Audio.setAudioModeAsync({
|
|
115
115
|
allowsRecordingIOS: false,
|
|
116
116
|
staysActiveInBackground: false,
|
|
117
|
-
interruptionModeIOS:
|
|
117
|
+
interruptionModeIOS: 1,
|
|
118
118
|
playsInSilentModeIOS: !this._obeyMuteSwitch,
|
|
119
119
|
shouldDuckAndroid: true,
|
|
120
|
-
interruptionModeAndroid:
|
|
120
|
+
interruptionModeAndroid: 1,
|
|
121
121
|
playThroughEarpieceAndroid: false
|
|
122
122
|
});
|
|
123
123
|
const soundStatus = yield this.soundObject.getStatusAsync();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/createInnerAudioContext/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/createInnerAudioContext/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,15 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import Geolocation from '@react-native-community/geolocation';
|
|
11
|
-
import
|
|
12
|
-
import { askAsyncPermissions } from '../../utils/premissions';
|
|
11
|
+
import { requestForegroundPermissionsAsync } from 'expo-location';
|
|
13
12
|
import { errorHandler } from '../../utils';
|
|
14
13
|
export function getLocation(opts = {}) {
|
|
15
14
|
return __awaiter(this, void 0, void 0, function* () {
|
|
16
15
|
const { isHighAccuracy = false, highAccuracyExpireTime = 3000, success, fail, complete } = opts;
|
|
17
16
|
try {
|
|
18
|
-
const
|
|
19
|
-
if (
|
|
17
|
+
const { granted } = yield requestForegroundPermissionsAsync();
|
|
18
|
+
if (!granted) {
|
|
20
19
|
const res = { errMsg: 'Permissions denied!' };
|
|
21
20
|
return errorHandler(fail, complete)(res);
|
|
22
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getLocation/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,WAAW,MAAM,qCAAqC,CAAA;AAC7D,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getLocation/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,WAAW,MAAM,qCAAqC,CAAA;AAC7D,OAAO,EAAE,iCAAiC,EAAE,MAAM,eAAe,CAAA;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,MAAM,UAAgB,WAAW,CAAC,OAAgC,EAAE;;QAClE,MAAM,EAAE,cAAc,GAAG,KAAK,EAAE,sBAAsB,GAAG,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;QAE/F,IAAI;YACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,iCAAiC,EAAE,CAAA;YAC7D,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAA;gBAC7C,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;aACzC;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,GAAG,GAAG,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAA;YAC7C,OAAO,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAA;SACzC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,WAAW,CAAC,kBAAkB,CAC5B,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBACb,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;gBACjE,MAAM,GAAG,GAAG;oBACV,QAAQ;oBACR,SAAS;oBACT,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,CAAC;oBACjB,QAAQ,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,CAAC;oBACvB,QAAQ;oBACR,gBAAgB,EAAE,CAAC;oBACnB,kBAAkB,EAAE,CAAC;oBACrB,MAAM,EAAE,gBAAgB;iBACzB,CAAA;gBACD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAG,GAAG,CAAC,CAAA;gBACd,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;gBACf,OAAO,CAAC,GAAG,CAAC,CAAA;YACd,CAAC,EACD,CAAC,GAAG,EAAE,EAAE;gBACN,MAAM,GAAG,GAAG;oBACV,MAAM,EAAE,kBAAkB;oBAC1B,GAAG;iBACJ,CAAA;gBACD,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAG,GAAG,CAAC,CAAA;gBACX,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,GAAG,CAAC,CAAA;gBACf,MAAM,CAAC,GAAG,CAAC,CAAA;YACb,CAAC,EACD;gBACE,qDAAqD;gBACrD,OAAO,EAAE,sBAAsB;gBAC/B,4CAA4C;gBAC5C,UAAU,EAAE,CAAC;gBACb,kBAAkB,EAAE,cAAc;aACnC,CACF,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CAAA"}
|
|
@@ -8,7 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { Audio } from 'expo-av';
|
|
11
|
-
import * as Permissions from 'expo-permissions';
|
|
12
11
|
import * as FileSystem from 'expo-file-system';
|
|
13
12
|
class RecorderManager {
|
|
14
13
|
static getInstance() {
|
|
@@ -31,13 +30,10 @@ class RecorderManager {
|
|
|
31
30
|
start(opts = {}) {
|
|
32
31
|
var _a;
|
|
33
32
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
|
-
const {
|
|
35
|
-
if (
|
|
36
|
-
const {
|
|
37
|
-
|
|
38
|
-
const res = { errMsg: 'Permissions denied!' };
|
|
39
|
-
return Promise.reject(res);
|
|
40
|
-
}
|
|
33
|
+
const { granted } = yield Audio.requestPermissionsAsync();
|
|
34
|
+
if (!granted) {
|
|
35
|
+
const res = { errMsg: 'Permissions denied!' };
|
|
36
|
+
return Promise.reject(res);
|
|
41
37
|
}
|
|
42
38
|
const {
|
|
43
39
|
// duration = 60000,
|
|
@@ -54,11 +50,11 @@ class RecorderManager {
|
|
|
54
50
|
try {
|
|
55
51
|
yield Audio.setAudioModeAsync({
|
|
56
52
|
allowsRecordingIOS: true,
|
|
57
|
-
interruptionModeIOS:
|
|
53
|
+
interruptionModeIOS: 1,
|
|
58
54
|
playsInSilentModeIOS: true,
|
|
59
55
|
staysActiveInBackground: false,
|
|
60
56
|
shouldDuckAndroid: true,
|
|
61
|
-
interruptionModeAndroid:
|
|
57
|
+
interruptionModeAndroid: 1,
|
|
62
58
|
playThroughEarpieceAndroid: true
|
|
63
59
|
});
|
|
64
60
|
if (RecorderManager.recordInstance) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getRecorderManager/index.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAC/B,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/getRecorderManager/index.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/media.js
CHANGED
|
@@ -8,9 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import CameraRoll from '@react-native-community/cameraroll';
|
|
11
|
-
import
|
|
11
|
+
import { requestCameraPermissionsAsync } from 'expo-camera';
|
|
12
12
|
import * as ImagePicker from 'expo-image-picker';
|
|
13
|
-
import { askAsyncPermissions } from '../utils/premissions';
|
|
14
13
|
import { successHandler, errorHandler } from '../utils';
|
|
15
14
|
export const MEDIA_TYPE = {
|
|
16
15
|
VIDEOS: 'Videos',
|
|
@@ -19,8 +18,8 @@ export const MEDIA_TYPE = {
|
|
|
19
18
|
export function saveMedia(opts, type, API) {
|
|
20
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
20
|
const { filePath, success, fail, complete } = opts;
|
|
22
|
-
const
|
|
23
|
-
if (
|
|
21
|
+
const { granted } = yield ImagePicker.requestMediaLibraryPermissionsAsync();
|
|
22
|
+
if (!granted) {
|
|
24
23
|
const res = { errMsg: 'Permissions denied!' };
|
|
25
24
|
return errorHandler(fail, complete)(res);
|
|
26
25
|
}
|
|
@@ -49,8 +48,8 @@ export function chooseMedia(opts, mediaTypes) {
|
|
|
49
48
|
videoMaxDuration: maxDuration
|
|
50
49
|
};
|
|
51
50
|
const isCamera = sourceType[0] === 'camera';
|
|
52
|
-
const
|
|
53
|
-
if (
|
|
51
|
+
const { granted } = isCamera ? yield requestCameraPermissionsAsync() : yield ImagePicker.requestMediaLibraryPermissionsAsync();
|
|
52
|
+
if (!granted) {
|
|
54
53
|
const res = { errMsg: 'Permissions denied!' };
|
|
55
54
|
return errorHandler(fail, complete)(res);
|
|
56
55
|
}
|
package/dist/lib/media.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/lib/media.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,UAAU,MAAM,oCAAoC,CAAA;AAC3D,OAAO,
|
|
1
|
+
{"version":3,"file":"media.js","sourceRoot":"","sources":["../../src/lib/media.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/permission.js
CHANGED
|
@@ -8,13 +8,20 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { Linking, AppState } from 'react-native';
|
|
11
|
-
import
|
|
11
|
+
import { getCameraPermissionsAsync, getMicrophonePermissionsAsync, requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera';
|
|
12
|
+
import { getMediaLibraryPermissionsAsync, requestMediaLibraryPermissionsAsync } from 'expo-image-picker';
|
|
13
|
+
import { getForegroundPermissionsAsync,
|
|
14
|
+
// getBackgroundPermissionsAsync,
|
|
15
|
+
requestForegroundPermissionsAsync,
|
|
16
|
+
// requestBackgroundPermissionsAsync
|
|
17
|
+
} from 'expo-location';
|
|
12
18
|
import { errorHandler, successHandler } from '../utils';
|
|
13
19
|
const scopeMap = {
|
|
14
|
-
'scope.userLocation':
|
|
15
|
-
'scope.record':
|
|
16
|
-
'scope.writePhotosAlbum':
|
|
17
|
-
'scope.camera':
|
|
20
|
+
'scope.userLocation': [getForegroundPermissionsAsync, requestForegroundPermissionsAsync],
|
|
21
|
+
'scope.record': [getMicrophonePermissionsAsync, requestMicrophonePermissionsAsync],
|
|
22
|
+
'scope.writePhotosAlbum': [getMediaLibraryPermissionsAsync, requestMediaLibraryPermissionsAsync],
|
|
23
|
+
'scope.camera': [getCameraPermissionsAsync, requestCameraPermissionsAsync],
|
|
24
|
+
// 'scope.userLocationBackground': [getBackgroundPermissionsAsync, requestBackgroundPermissionsAsync],
|
|
18
25
|
// 'scope.NOTIFICATIONS': Permissions.NOTIFICATIONS,
|
|
19
26
|
// 'scope.USER_FACING_NOTIFICATIONS': Permissions.USER_FACING_NOTIFICATIONS,
|
|
20
27
|
// 'scope.CONTACTS': Permissions.CONTACTS,
|
|
@@ -25,17 +32,11 @@ const scopeMap = {
|
|
|
25
32
|
let stateListener; // 缓存监听函数
|
|
26
33
|
let appStateSubscription;
|
|
27
34
|
const getAuthSetting = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
28
|
-
const keyArr = Object.keys(scopeMap);
|
|
29
|
-
const scopeArr = keyArr.map(key => scopeMap[key]);
|
|
30
35
|
let auths = {};
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
auths[skey] = permissions[pkey].status === 'granted';
|
|
36
|
-
}
|
|
37
|
-
});
|
|
38
|
-
});
|
|
36
|
+
yield Promise.all(Object.keys(scopeMap).map((key) => __awaiter(void 0, void 0, void 0, function* () {
|
|
37
|
+
const { granted } = yield scopeMap[key][0]();
|
|
38
|
+
auths[key] = granted;
|
|
39
|
+
})));
|
|
39
40
|
return auths;
|
|
40
41
|
});
|
|
41
42
|
const handleAppStateChange = (_nextAppState, resolve, reject, opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -64,8 +65,8 @@ export function authorize(opts) {
|
|
|
64
65
|
const { scope, success, fail, complete } = opts;
|
|
65
66
|
const res = {};
|
|
66
67
|
try {
|
|
67
|
-
const {
|
|
68
|
-
if (
|
|
68
|
+
const { granted } = yield scopeMap[scope][1]();
|
|
69
|
+
if (granted) {
|
|
69
70
|
res.errMsg = 'authorize:ok';
|
|
70
71
|
return successHandler(success, complete)(res);
|
|
71
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/lib/permission.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAA2B,MAAM,cAAc,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/lib/permission.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,11 +9,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import { SafeAreaView } from 'react-native-safe-area-context';
|
|
11
11
|
import { Camera } from 'expo-camera';
|
|
12
|
-
import { BarCodeScanner } from 'expo-barcode-scanner';
|
|
12
|
+
import { BarCodeScanner, requestPermissionsAsync } from 'expo-barcode-scanner';
|
|
13
13
|
import { BackHandler, Image, TouchableOpacity, StyleSheet, View, Dimensions, Platform, StatusBar } from 'react-native';
|
|
14
14
|
import iconClose from './icon_close.png';
|
|
15
15
|
import iconPic from './icon_pic.png';
|
|
16
|
-
import * as Permissions from 'expo-permissions';
|
|
17
16
|
import RootSiblings from 'react-native-root-siblings';
|
|
18
17
|
import { chooseMedia, MEDIA_TYPE } from '../media';
|
|
19
18
|
import React from 'react';
|
|
@@ -142,15 +141,14 @@ function scanFromPhoto(callback, errorCallBack) {
|
|
|
142
141
|
export function scanCode(option = {}) {
|
|
143
142
|
return __awaiter(this, void 0, void 0, function* () {
|
|
144
143
|
const { success, fail, complete, onlyFromCamera, scanType = ['barCode', 'qrCode'] } = option;
|
|
145
|
-
const {
|
|
146
|
-
if (
|
|
144
|
+
const { granted } = yield requestPermissionsAsync();
|
|
145
|
+
if (!granted) {
|
|
147
146
|
const res = { errMsg: 'Permissions denied!' };
|
|
148
147
|
fail === null || fail === void 0 ? void 0 : fail(res);
|
|
149
148
|
complete === null || complete === void 0 ? void 0 : complete(res);
|
|
150
149
|
return Promise.reject(res);
|
|
151
150
|
}
|
|
152
151
|
const barCodeTypes = getBarCodeTypes(scanType);
|
|
153
|
-
const cameraRef = React.createRef();
|
|
154
152
|
return new Promise((resolve, reject) => {
|
|
155
153
|
scannerView = new RootSiblings((React.createElement(View, { style: [styles.container] },
|
|
156
154
|
React.createElement(StatusBar, { backgroundColor: "rgba(0, 0, 0, 0)", translucent: true, hidden: Platform.OS === 'ios' }),
|
|
@@ -167,7 +165,7 @@ export function scanCode(option = {}) {
|
|
|
167
165
|
complete === null || complete === void 0 ? void 0 : complete(res);
|
|
168
166
|
hide(scannerView);
|
|
169
167
|
resolve(res);
|
|
170
|
-
},
|
|
168
|
+
}, barCodeScannerSettings: {
|
|
171
169
|
barCodeTypes,
|
|
172
170
|
}, style: { width, height }, ratio: '16:9' }),
|
|
173
171
|
React.createElement(TouchableOpacity, { accessibilityLabel: "Close", style: styles.closeIcon, onPress: () => hide(scannerView) }, safeViewWrapper(React.createElement(Image, { source: iconClose, style: styles.closeImg }))),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/scanCode/index.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAA;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/scanCode/index.tsx"],"names":[],"mappings":"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"}
|
package/dist/setup.js
CHANGED
|
@@ -39,7 +39,6 @@ jest.doMock('react-native', () => {
|
|
|
39
39
|
});
|
|
40
40
|
jest.doMock('expo-modules-core', () => {
|
|
41
41
|
const unimodules = jest.requireActual('expo-modules-core');
|
|
42
|
-
const permisson = jest.requireActual('./__tests__/__mock__/mockExpoPermissions');
|
|
43
42
|
const { NativeModulesProxy } = unimodules;
|
|
44
43
|
NativeModulesProxy.ExpoLocation = {
|
|
45
44
|
getCurrentPositionAsync: jest.fn(() => Promise.resolve({
|
|
@@ -52,7 +51,24 @@ jest.doMock('expo-modules-core', () => {
|
|
|
52
51
|
}
|
|
53
52
|
}))
|
|
54
53
|
};
|
|
55
|
-
NativeModulesProxy.ExpoPermissions = permisson;
|
|
56
54
|
return unimodules;
|
|
57
55
|
});
|
|
56
|
+
const grantedPromise = jest.fn(() => Promise.resolve({
|
|
57
|
+
granted: true
|
|
58
|
+
}));
|
|
59
|
+
jest.doMock('expo-image-picker', () => {
|
|
60
|
+
const expoImagePicker = jest.requireActual('expo-image-picker');
|
|
61
|
+
expoImagePicker.requestMediaLibraryPermissionsAsync = grantedPromise;
|
|
62
|
+
return expoImagePicker;
|
|
63
|
+
});
|
|
64
|
+
jest.doMock('expo-location', () => {
|
|
65
|
+
const expoLocation = jest.requireActual('expo-location');
|
|
66
|
+
expoLocation.requestForegroundPermissionsAsync = grantedPromise;
|
|
67
|
+
return expoLocation;
|
|
68
|
+
});
|
|
69
|
+
jest.doMock('expo-barcode-scanner', () => {
|
|
70
|
+
const expoBarcodeSacnner = jest.requireActual('expo-barcode-scanner');
|
|
71
|
+
expoBarcodeSacnner.requestPermissionsAsync = grantedPromise;
|
|
72
|
+
return expoBarcodeSacnner;
|
|
73
|
+
});
|
|
58
74
|
//# sourceMappingURL=setup.js.map
|
package/dist/setup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,4CAA4C,CAAA;AACnD,OAAO,cAAc,MAAM,sDAAsD,CAAA;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAA;AAClE,OAAO,mBAAmB,MAAM,sEAAsE,CAAA;AACtG,OAAO,iBAAiB,MAAM,6DAA6D,CAAA;AAE3F,IAAI,CAAC,MAAM,CAAC,iCAAiC,EAAE,GAAG,EAAE,CAAC,iCAAM,cAAc,KAAE,gBAAgB,IAAG,CAAC,CAAA;AAC/F,IAAI,CAAC,MAAM,CAAC,2CAA2C,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,CAAA;AACnF,IAAI,CAAC,MAAM,CAAC,0BAA0B,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,CAAA;AAEhE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,EAAE;IAC/B,MAAM,WAAW,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAQ,CAAA;IAE7D,sFAAsF;IACtF,MAAM,SAAS,GAAI,IAAI,CAAC,aAAa,CAAC,kCAAkC,CAAS,CAAC,OAAO,CAAA;IACzF,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,EAAE;QAC9C,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,KAAK;QACnB,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,SAAS;KACjB,CAAC,CAAA;IAEF,wEAAwE;IACxE,MAAM,aAAa,GAAI,IAAI,CAAC,aAAa,CAAC,wCAAwC,CAAS,CAAC,OAAO,CAAA;IACnG,MAAM,aAAa,GAAI,IAAI,CAAC,aAAa,CAAC,oCAAoC,CAAS,CAAC,OAAO,CAAA;IAC/F,MAAM,cAAc,GAAI,IAAI,CAAC,aAAa,CAAC,yCAAyC,CAAS,CAAC,OAAO,CAAA;IACrG,WAAW,CAAC,aAAa,CAAC,aAAa,GAAG,aAAa,CAAA;IACvD,WAAW,CAAC,aAAa,CAAC,YAAY,GAAG,IAAI,aAAa,EAAE,CAAA;IAC5D,WAAW,CAAC,aAAa,CAAC,cAAc,GAAG,cAAc,CAAA;IACzD,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,aAAa,EAAE,aAAa,EAAE;QAC9D,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,IAAI;QAChB,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YACV,aAAa,EAAE,IAAI,CAAC,EAAE,EAAE;YACxB,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,OAAY,EAAE,EAAE;gBACtC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;gBACpD,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;YACpC,CAAC,CAAC;SACH,CAAC;KACH,CAAC,CAAA;IACF,OAAO,WAAW,CAAA;AACpB,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,MAAM,CAAC,mBAAmB,EAAE,GAAG,EAAE;IACpC,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAQ,CAAA;IACjE,MAAM,
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/taro-rn",
|
|
3
|
-
"version": "3.5.0-
|
|
3
|
+
"version": "3.5.0-beta.0",
|
|
4
4
|
"description": "Taro RN framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "types/index.d.ts",
|
|
@@ -37,20 +37,19 @@
|
|
|
37
37
|
"@react-native-community/clipboard": "~1.5.1",
|
|
38
38
|
"@react-native-community/geolocation": "~2.0.2",
|
|
39
39
|
"@react-native-community/netinfo": "~7.1.2",
|
|
40
|
-
"@tarojs/runtime-rn": "3.5.0-
|
|
40
|
+
"@tarojs/runtime-rn": "3.5.0-beta.0",
|
|
41
41
|
"babel-preset-expo": "~9.0.2",
|
|
42
42
|
"base64-js": "^1.3.0",
|
|
43
|
-
"expo-av": "~
|
|
44
|
-
"expo-barcode-scanner": "~11.
|
|
45
|
-
"expo-brightness": "~10.
|
|
46
|
-
"expo-camera": "~12.
|
|
47
|
-
"expo-file-system": "~
|
|
48
|
-
"expo-image-picker": "~
|
|
49
|
-
"expo-keep-awake": "~10.
|
|
43
|
+
"expo-av": "~11.2.3",
|
|
44
|
+
"expo-barcode-scanner": "~11.3.0",
|
|
45
|
+
"expo-brightness": "~10.2.0",
|
|
46
|
+
"expo-camera": "~12.2.0",
|
|
47
|
+
"expo-file-system": "~14.0.0",
|
|
48
|
+
"expo-image-picker": "~13.1.1",
|
|
49
|
+
"expo-keep-awake": "~10.1.1",
|
|
50
50
|
"expo-location": "~14.0.2",
|
|
51
|
-
"expo-modules-core": "~0.
|
|
52
|
-
"expo-
|
|
53
|
-
"expo-sensors": "~11.1.1",
|
|
51
|
+
"expo-modules-core": "~0.9.2",
|
|
52
|
+
"expo-sensors": "~11.2.0",
|
|
54
53
|
"nullthrows": "^1.1.1",
|
|
55
54
|
"react-native-device-info": "~8.4.8",
|
|
56
55
|
"react-native-image-resizer": "~1.4.5",
|
|
@@ -62,7 +61,6 @@
|
|
|
62
61
|
"react-native-syan-image-picker": "0.5.3"
|
|
63
62
|
},
|
|
64
63
|
"devDependencies": {
|
|
65
|
-
"@tarojs/taro": "3.5.0-alpha.9",
|
|
66
64
|
"@types/react": "^17.0.0",
|
|
67
65
|
"@types/react-native": "0.67.0",
|
|
68
66
|
"fbjs-scripts": "^3.0.1",
|
|
@@ -74,20 +72,20 @@
|
|
|
74
72
|
"@react-native-community/clipboard": "~1.5.1",
|
|
75
73
|
"@react-native-community/geolocation": "~2.0.2",
|
|
76
74
|
"@react-native-community/netinfo": "~7.1.2",
|
|
77
|
-
"expo-av": "~
|
|
78
|
-
"expo-barcode-scanner": "~11.
|
|
79
|
-
"expo-brightness": "~10.
|
|
80
|
-
"expo-camera": "~12.
|
|
81
|
-
"expo-file-system": "~
|
|
82
|
-
"expo-image-picker": "~
|
|
83
|
-
"expo-keep-awake": "~10.
|
|
84
|
-
"expo-
|
|
85
|
-
"expo-
|
|
86
|
-
"expo-sensors": "~11.
|
|
75
|
+
"expo-av": "~11.2.3",
|
|
76
|
+
"expo-barcode-scanner": "~11.3.0",
|
|
77
|
+
"expo-brightness": "~10.2.0",
|
|
78
|
+
"expo-camera": "~12.2.0",
|
|
79
|
+
"expo-file-system": "~14.0.0",
|
|
80
|
+
"expo-image-picker": "~13.1.1",
|
|
81
|
+
"expo-keep-awake": "~10.1.1",
|
|
82
|
+
"expo-location": "~14.0.2",
|
|
83
|
+
"expo-modules-core": "~0.9.2",
|
|
84
|
+
"expo-sensors": "~11.2.0",
|
|
87
85
|
"react-native-device-info": "~8.4.8",
|
|
88
86
|
"react-native-image-resizer": "~1.4.5",
|
|
89
87
|
"react-native-safe-area-context": "~3.4.1",
|
|
90
88
|
"react-native-syan-image-picker": "0.5.3"
|
|
91
89
|
},
|
|
92
|
-
"gitHead": "
|
|
90
|
+
"gitHead": "ee17506905a260bacd1aa6217a2376ba7bb8200f"
|
|
93
91
|
}
|
|
@@ -16,6 +16,11 @@ exports[`scanCode should render scanCode success 1`] = `
|
|
|
16
16
|
}
|
|
17
17
|
>
|
|
18
18
|
<ViewManagerAdapter_ExponentCamera
|
|
19
|
+
onBarCodeScanned={[Function]}
|
|
20
|
+
onCameraReady={[Function]}
|
|
21
|
+
onFacesDetected={[Function]}
|
|
22
|
+
onMountError={[Function]}
|
|
23
|
+
onPictureSaved={[Function]}
|
|
19
24
|
proxiedProperties={
|
|
20
25
|
Object {
|
|
21
26
|
"autoFocus": undefined,
|
|
@@ -26,11 +31,6 @@ exports[`scanCode should render scanCode success 1`] = `
|
|
|
26
31
|
"faceDetectorSettings": Object {},
|
|
27
32
|
"flashMode": undefined,
|
|
28
33
|
"focusDepth": 0,
|
|
29
|
-
"onBarCodeScanned": [Function],
|
|
30
|
-
"onCameraReady": [Function],
|
|
31
|
-
"onFacesDetected": [Function],
|
|
32
|
-
"onMountError": [Function],
|
|
33
|
-
"onPictureSaved": [Function],
|
|
34
34
|
"type": undefined,
|
|
35
35
|
"whiteBalance": undefined,
|
|
36
36
|
"zoom": 0,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as Permissions from 'expo-permissions'
|
|
2
1
|
import { errorHandler, successHandler } from '../../utils'
|
|
2
|
+
import { requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera'
|
|
3
3
|
const globalAny: any = global
|
|
4
4
|
|
|
5
5
|
class CameraContext {
|
|
@@ -14,30 +14,39 @@ class CameraContext {
|
|
|
14
14
|
* 开始录像
|
|
15
15
|
*/
|
|
16
16
|
startRecord = (option: Taro.CameraContext.StartRecordOption) => {
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
17
|
+
Promise.all([requestCameraPermissionsAsync(), requestMicrophonePermissionsAsync()]).then(([cameraPermission, microphonePermission]) => {
|
|
18
|
+
if(cameraPermission.granted && microphonePermission.granted) {
|
|
19
|
+
this.cameraRef?.recordAsync().then((res) => {
|
|
20
|
+
const { uri } = res
|
|
21
|
+
const result = {
|
|
22
|
+
tempVideoPath: uri,
|
|
23
|
+
tempThumbPath: '',
|
|
24
|
+
errMsg: 'stopRecord: ok'
|
|
25
|
+
}
|
|
26
|
+
this.recordCallback?.success?.(result)
|
|
27
|
+
}).catch((e) => {
|
|
28
|
+
const res = {
|
|
29
|
+
errMsg: e.message
|
|
30
|
+
}
|
|
31
|
+
option?.fail?.(res)
|
|
32
|
+
option?.complete?.(res)
|
|
33
|
+
this.recordCallback?.fail?.({ errMsg: e })
|
|
34
|
+
}).finally(() => {
|
|
35
|
+
this.recordCallback?.complete?.({ errMsg: '' })
|
|
36
|
+
})
|
|
37
|
+
const res = {
|
|
38
|
+
errMsg: 'startRecord: ok'
|
|
24
39
|
}
|
|
25
|
-
|
|
26
|
-
|
|
40
|
+
option?.success?.(res)
|
|
41
|
+
option?.complete?.(res)
|
|
42
|
+
} else {
|
|
27
43
|
const res = {
|
|
28
|
-
errMsg:
|
|
44
|
+
errMsg: 'startRecord: fail',
|
|
45
|
+
err: Error('You have not enabled camera or microphone permissions')
|
|
29
46
|
}
|
|
30
47
|
option?.fail?.(res)
|
|
31
48
|
option?.complete?.(res)
|
|
32
|
-
this.recordCallback?.fail?.({ errMsg: e })
|
|
33
|
-
}).finally(() => {
|
|
34
|
-
this.recordCallback?.complete?.({ errMsg: '' })
|
|
35
|
-
})
|
|
36
|
-
const res = {
|
|
37
|
-
errMsg: 'startRecord: ok'
|
|
38
49
|
}
|
|
39
|
-
option?.success?.(res)
|
|
40
|
-
option?.complete?.(res)
|
|
41
50
|
})
|
|
42
51
|
}
|
|
43
52
|
|
|
@@ -67,8 +76,8 @@ class CameraContext {
|
|
|
67
76
|
break
|
|
68
77
|
}
|
|
69
78
|
try {
|
|
70
|
-
const {
|
|
71
|
-
if (
|
|
79
|
+
const { granted } = await requestCameraPermissionsAsync()
|
|
80
|
+
if (granted) {
|
|
72
81
|
if (this.cameraRef?.takePictureAsync) {
|
|
73
82
|
const { uri } = await this.cameraRef.takePictureAsync({ quality: _quality })
|
|
74
83
|
const res = {
|
|
@@ -141,10 +141,10 @@ class InnerAudioContext {
|
|
|
141
141
|
await Audio.setAudioModeAsync({
|
|
142
142
|
allowsRecordingIOS: false,
|
|
143
143
|
staysActiveInBackground: false,
|
|
144
|
-
interruptionModeIOS:
|
|
144
|
+
interruptionModeIOS: 1, // InterruptionModeIOS.DoNotMix
|
|
145
145
|
playsInSilentModeIOS: !this._obeyMuteSwitch,
|
|
146
146
|
shouldDuckAndroid: true,
|
|
147
|
-
interruptionModeAndroid:
|
|
147
|
+
interruptionModeAndroid: 1, // InterruptionModeAndroid.DoNotMix
|
|
148
148
|
playThroughEarpieceAndroid: false
|
|
149
149
|
})
|
|
150
150
|
const soundStatus = await this.soundObject.getStatusAsync()
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
import Geolocation from '@react-native-community/geolocation'
|
|
2
|
-
import
|
|
3
|
-
import { askAsyncPermissions } from '../../utils/premissions'
|
|
2
|
+
import { requestForegroundPermissionsAsync } from 'expo-location'
|
|
4
3
|
import { errorHandler } from '../../utils'
|
|
5
4
|
|
|
6
5
|
export async function getLocation(opts: Taro.getLocation.Option = {}): Promise<Taro.getLocation.SuccessCallbackResult> {
|
|
7
6
|
const { isHighAccuracy = false, highAccuracyExpireTime = 3000, success, fail, complete } = opts
|
|
8
7
|
|
|
9
8
|
try {
|
|
10
|
-
const
|
|
11
|
-
if (
|
|
9
|
+
const { granted } = await requestForegroundPermissionsAsync()
|
|
10
|
+
if (!granted) {
|
|
12
11
|
const res = { errMsg: 'Permissions denied!' }
|
|
13
12
|
return errorHandler(fail, complete)(res)
|
|
14
13
|
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Audio } from 'expo-av'
|
|
2
|
-
import * as Permissions from 'expo-permissions'
|
|
3
2
|
import * as FileSystem from 'expo-file-system'
|
|
4
3
|
|
|
5
4
|
class RecorderManager {
|
|
@@ -52,13 +51,10 @@ class RecorderManager {
|
|
|
52
51
|
* @param {string} [opts.audioSource='auto'] - 指定录音的音频输入源，可通过 wx.getAvailableAudioSources() 获取当前可用的音频源 ❌
|
|
53
52
|
*/
|
|
54
53
|
async start (opts = {}) {
|
|
55
|
-
const {
|
|
56
|
-
if (
|
|
57
|
-
const {
|
|
58
|
-
|
|
59
|
-
const res = { errMsg: 'Permissions denied!' }
|
|
60
|
-
return Promise.reject(res)
|
|
61
|
-
}
|
|
54
|
+
const { granted } = await Audio.requestPermissionsAsync()
|
|
55
|
+
if (!granted) {
|
|
56
|
+
const res = { errMsg: 'Permissions denied!' }
|
|
57
|
+
return Promise.reject(res)
|
|
62
58
|
}
|
|
63
59
|
|
|
64
60
|
const {
|
|
@@ -78,11 +74,11 @@ class RecorderManager {
|
|
|
78
74
|
try {
|
|
79
75
|
await Audio.setAudioModeAsync({
|
|
80
76
|
allowsRecordingIOS: true,
|
|
81
|
-
interruptionModeIOS:
|
|
77
|
+
interruptionModeIOS: 1, // InterruptionModeIOS.DoNotMix
|
|
82
78
|
playsInSilentModeIOS: true,
|
|
83
79
|
staysActiveInBackground: false,
|
|
84
80
|
shouldDuckAndroid: true,
|
|
85
|
-
interruptionModeAndroid:
|
|
81
|
+
interruptionModeAndroid: 1, //InterruptionModeAndroid.DoNotMix
|
|
86
82
|
playThroughEarpieceAndroid: true
|
|
87
83
|
} as any)
|
|
88
84
|
|
package/src/lib/media.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import CameraRoll from '@react-native-community/cameraroll'
|
|
2
|
-
import
|
|
2
|
+
import { requestCameraPermissionsAsync } from 'expo-camera'
|
|
3
3
|
import * as ImagePicker from 'expo-image-picker'
|
|
4
|
-
import { askAsyncPermissions } from '../utils/premissions'
|
|
5
4
|
import { successHandler, errorHandler } from '../utils'
|
|
6
5
|
|
|
7
6
|
export const MEDIA_TYPE = {
|
|
@@ -11,8 +10,8 @@ export const MEDIA_TYPE = {
|
|
|
11
10
|
|
|
12
11
|
export async function saveMedia(opts: Taro.saveImageToPhotosAlbum.Option | Taro.saveVideoToPhotosAlbum.Option, type:string, API:string):Promise<TaroGeneral.CallbackResult> {
|
|
13
12
|
const { filePath, success, fail, complete } = opts
|
|
14
|
-
const
|
|
15
|
-
if (
|
|
13
|
+
const { granted } = await ImagePicker.requestMediaLibraryPermissionsAsync()
|
|
14
|
+
if (!granted) {
|
|
16
15
|
const res = { errMsg: 'Permissions denied!' }
|
|
17
16
|
return errorHandler(fail, complete)(res)
|
|
18
17
|
}
|
|
@@ -40,8 +39,8 @@ export async function chooseMedia(opts: Taro.chooseImage.Option | Taro.chooseVid
|
|
|
40
39
|
videoMaxDuration: maxDuration
|
|
41
40
|
}
|
|
42
41
|
const isCamera = sourceType[0] === 'camera'
|
|
43
|
-
const
|
|
44
|
-
if (
|
|
42
|
+
const { granted } = isCamera ? await requestCameraPermissionsAsync() : await ImagePicker.requestMediaLibraryPermissionsAsync()
|
|
43
|
+
if (!granted) {
|
|
45
44
|
const res = { errMsg: 'Permissions denied!' }
|
|
46
45
|
return errorHandler(fail, complete)(res)
|
|
47
46
|
}
|
package/src/lib/permission.ts
CHANGED
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
import { Linking, AppState, NativeEventSubscription } from 'react-native';
|
|
2
|
-
import
|
|
2
|
+
import { getCameraPermissionsAsync, getMicrophonePermissionsAsync, requestCameraPermissionsAsync, requestMicrophonePermissionsAsync } from 'expo-camera'
|
|
3
|
+
import { getMediaLibraryPermissionsAsync, requestMediaLibraryPermissionsAsync } from 'expo-image-picker'
|
|
4
|
+
import {
|
|
5
|
+
getForegroundPermissionsAsync,
|
|
6
|
+
// getBackgroundPermissionsAsync,
|
|
7
|
+
requestForegroundPermissionsAsync,
|
|
8
|
+
// requestBackgroundPermissionsAsync
|
|
9
|
+
} from 'expo-location'
|
|
3
10
|
import { errorHandler, successHandler } from '../utils';
|
|
4
11
|
|
|
5
12
|
const scopeMap = {
|
|
6
|
-
'scope.userLocation':
|
|
7
|
-
'scope.record':
|
|
8
|
-
'scope.writePhotosAlbum':
|
|
9
|
-
'scope.camera':
|
|
13
|
+
'scope.userLocation': [getForegroundPermissionsAsync, requestForegroundPermissionsAsync],
|
|
14
|
+
'scope.record': [getMicrophonePermissionsAsync, requestMicrophonePermissionsAsync],
|
|
15
|
+
'scope.writePhotosAlbum': [getMediaLibraryPermissionsAsync, requestMediaLibraryPermissionsAsync],
|
|
16
|
+
'scope.camera': [getCameraPermissionsAsync, requestCameraPermissionsAsync],
|
|
17
|
+
// 'scope.userLocationBackground': [getBackgroundPermissionsAsync, requestBackgroundPermissionsAsync],
|
|
10
18
|
// 'scope.NOTIFICATIONS': Permissions.NOTIFICATIONS,
|
|
11
19
|
// 'scope.USER_FACING_NOTIFICATIONS': Permissions.USER_FACING_NOTIFICATIONS,
|
|
12
20
|
// 'scope.CONTACTS': Permissions.CONTACTS,
|
|
@@ -19,17 +27,13 @@ let stateListener // 缓存监听函数
|
|
|
19
27
|
let appStateSubscription: NativeEventSubscription | undefined
|
|
20
28
|
|
|
21
29
|
const getAuthSetting = async () => {
|
|
22
|
-
const keyArr = Object.keys(scopeMap)
|
|
23
|
-
const scopeArr = keyArr.map(key => scopeMap[key])
|
|
24
30
|
let auths = {}
|
|
25
|
-
|
|
26
|
-
Object.keys(
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
})
|
|
32
|
-
})
|
|
31
|
+
|
|
32
|
+
await Promise.all(Object.keys(scopeMap).map(async key => {
|
|
33
|
+
const { granted } = await scopeMap[key][0]()
|
|
34
|
+
auths[key] = granted
|
|
35
|
+
}))
|
|
36
|
+
|
|
33
37
|
return auths
|
|
34
38
|
}
|
|
35
39
|
|
|
@@ -62,8 +66,8 @@ export async function authorize(opts: Taro.authorize.Option): Promise<TaroGenera
|
|
|
62
66
|
const res: any = {}
|
|
63
67
|
|
|
64
68
|
try {
|
|
65
|
-
const {
|
|
66
|
-
if (
|
|
69
|
+
const { granted } = await scopeMap[scope][1]()
|
|
70
|
+
if (granted) {
|
|
67
71
|
res.errMsg = 'authorize:ok'
|
|
68
72
|
return successHandler(success, complete)(res)
|
|
69
73
|
} else {
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { SafeAreaView } from 'react-native-safe-area-context'
|
|
2
2
|
import { Camera } from 'expo-camera'
|
|
3
|
-
import { BarCodeScanner } from 'expo-barcode-scanner'
|
|
3
|
+
import { BarCodeScanner, requestPermissionsAsync } from 'expo-barcode-scanner'
|
|
4
4
|
import { BackHandler, Image, TouchableOpacity, StyleSheet, View, Dimensions, Platform, StatusBar } from 'react-native'
|
|
5
5
|
import iconClose from './icon_close.png'
|
|
6
6
|
import iconPic from './icon_pic.png'
|
|
7
|
-
import * as Permissions from 'expo-permissions'
|
|
8
7
|
import RootSiblings from 'react-native-root-siblings'
|
|
9
8
|
import { chooseMedia, MEDIA_TYPE } from '../media'
|
|
10
9
|
import React from 'react'
|
|
@@ -147,15 +146,14 @@ function scanFromPhoto(callback, errorCallBack) {
|
|
|
147
146
|
|
|
148
147
|
export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.scanCode.SuccessCallbackResult> {
|
|
149
148
|
const { success, fail, complete, onlyFromCamera, scanType = ['barCode', 'qrCode'] } = option
|
|
150
|
-
const {
|
|
151
|
-
if (
|
|
149
|
+
const { granted } = await requestPermissionsAsync();
|
|
150
|
+
if (!granted) {
|
|
152
151
|
const res = { errMsg: 'Permissions denied!' }
|
|
153
152
|
fail?.(res)
|
|
154
153
|
complete?.(res)
|
|
155
154
|
return Promise.reject(res)
|
|
156
155
|
}
|
|
157
156
|
const barCodeTypes = getBarCodeTypes(scanType)
|
|
158
|
-
const cameraRef = React.createRef<Camera>()
|
|
159
157
|
return new Promise((resolve, reject) => {
|
|
160
158
|
scannerView = new RootSiblings(
|
|
161
159
|
(<View style={[styles.container]}>
|
|
@@ -175,7 +173,6 @@ export async function scanCode(option: Taro.scanCode.Option = {}): Promise<Taro.
|
|
|
175
173
|
hide(scannerView)
|
|
176
174
|
resolve(res)
|
|
177
175
|
}}
|
|
178
|
-
ref={cameraRef}
|
|
179
176
|
barCodeScannerSettings={{
|
|
180
177
|
barCodeTypes,
|
|
181
178
|
}}
|
package/src/setup.ts
CHANGED
|
@@ -44,7 +44,6 @@ jest.doMock('react-native', () => {
|
|
|
44
44
|
|
|
45
45
|
jest.doMock('expo-modules-core', () => {
|
|
46
46
|
const unimodules = jest.requireActual('expo-modules-core') as any
|
|
47
|
-
const permisson = jest.requireActual('./__tests__/__mock__/mockExpoPermissions')
|
|
48
47
|
const { NativeModulesProxy } = unimodules
|
|
49
48
|
|
|
50
49
|
NativeModulesProxy.ExpoLocation = {
|
|
@@ -58,7 +57,27 @@ jest.doMock('expo-modules-core', () => {
|
|
|
58
57
|
}
|
|
59
58
|
}))
|
|
60
59
|
}
|
|
61
|
-
NativeModulesProxy.ExpoPermissions = permisson
|
|
62
|
-
|
|
63
60
|
return unimodules
|
|
64
61
|
})
|
|
62
|
+
|
|
63
|
+
const grantedPromise = jest.fn(() => Promise.resolve({
|
|
64
|
+
granted: true
|
|
65
|
+
}))
|
|
66
|
+
|
|
67
|
+
jest.doMock('expo-image-picker', () => {
|
|
68
|
+
const expoImagePicker = jest.requireActual('expo-image-picker') as any
|
|
69
|
+
expoImagePicker.requestMediaLibraryPermissionsAsync = grantedPromise
|
|
70
|
+
return expoImagePicker
|
|
71
|
+
})
|
|
72
|
+
|
|
73
|
+
jest.doMock('expo-location', () => {
|
|
74
|
+
const expoLocation = jest.requireActual('expo-location') as any
|
|
75
|
+
expoLocation.requestForegroundPermissionsAsync = grantedPromise
|
|
76
|
+
return expoLocation
|
|
77
|
+
})
|
|
78
|
+
|
|
79
|
+
jest.doMock('expo-barcode-scanner', () => {
|
|
80
|
+
const expoBarcodeSacnner = jest.requireActual('expo-barcode-scanner') as any
|
|
81
|
+
expoBarcodeSacnner.requestPermissionsAsync = grantedPromise
|
|
82
|
+
return expoBarcodeSacnner
|
|
83
|
+
})
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
|
-
import * as Permissions from 'expo-permissions';
|
|
11
|
-
export function askAsyncPermissions(PermissionsType) {
|
|
12
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
13
|
-
const { status } = yield Permissions.askAsync(PermissionsType);
|
|
14
|
-
return status;
|
|
15
|
-
});
|
|
16
|
-
}
|
|
17
|
-
//# sourceMappingURL=premissions.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"premissions.js","sourceRoot":"","sources":["../../src/utils/premissions.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C,MAAM,UAAgB,mBAAmB,CAAE,eAA2C;;QACpF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;QAC9D,OAAO,MAAM,CAAA;IACf,CAAC;CAAA"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
export const CAMERA = 'camera'
|
|
2
|
-
export const CAMERA_ROLL = 'mediaLibrary'
|
|
3
|
-
export const LOCATION = 'location'
|
|
4
|
-
export const askAsync = jest.fn().mockImplementation((permissionType) => {
|
|
5
|
-
const hasPermission = [CAMERA, CAMERA_ROLL, LOCATION].includes(permissionType)
|
|
6
|
-
const responseData = hasPermission ? { status: 'granted' } : { status: 'undetermined' } // you could also pass `denied` instead of `undetermined`
|
|
7
|
-
return Promise.resolve(responseData)
|
|
8
|
-
})
|
package/src/utils/premissions.ts
DELETED