优化++
This commit is contained in:
40
src/_core.js
40
src/_core.js
@@ -1,12 +1,19 @@
|
||||
import './polyfill';
|
||||
import {
|
||||
supportList,
|
||||
onScanListener, offScanListener, setStatusListener, getStatus,
|
||||
startScan, stopScan, scanVideo, scanImage, clear
|
||||
onScanListener, offScanListener,
|
||||
onScanErrorListener, offScanErrorListener,
|
||||
setStatusListener, getStatus,
|
||||
startScan, stopScan, scanImage, scanImageFromFile, clear
|
||||
} from './services/provider/scan';
|
||||
import { setConfig, getVersion } from './services/config';
|
||||
import { initWxJssdk } from './services/wx';
|
||||
import { printDebug } from './utils/logger';
|
||||
import {
|
||||
isSupportWebScan,
|
||||
prepareWebScanBarcodeDetector,
|
||||
isSupportImageScan
|
||||
} from './services/web';
|
||||
import { printDebug, printWarn } from './utils/logger';
|
||||
|
||||
let _readyPromise = null;
|
||||
let _calledReady = false;
|
||||
@@ -23,18 +30,25 @@ function config(config) {
|
||||
return _readyPromise;
|
||||
}
|
||||
_readyPromise = Promise.resolve().then(() => {
|
||||
return initWxJssdk().catch(err => {
|
||||
printDebug('init wx jssdk failed:', err && err.message ? err.message : err);
|
||||
});
|
||||
}).then(() => {
|
||||
printDebug('-------------------------------------');
|
||||
printDebug('sdk_version:', getVersion());
|
||||
printDebug('support_list:', supportList.map(item => item.name + ':' + item.support).join(', '));
|
||||
printDebug('-------------------------------------');
|
||||
initWxJssdk();
|
||||
return Promise.resolve().then(() => {
|
||||
_calledReady = true;
|
||||
}).catch(err => {
|
||||
_readyPromise = null;
|
||||
throw err;
|
||||
});
|
||||
})
|
||||
if (isSupportWebScan() || isSupportImageScan()) {
|
||||
return prepareWebScanBarcodeDetector().catch(err => {
|
||||
printWarn('prepare barcode detector failed:', err);
|
||||
});
|
||||
}
|
||||
}).then(() => {
|
||||
_calledReady = true;
|
||||
}).catch(err => {
|
||||
_readyPromise = null;
|
||||
throw err;
|
||||
});
|
||||
return _readyPromise;
|
||||
}
|
||||
|
||||
@@ -42,11 +56,13 @@ export default Object.assign({}, {
|
||||
config,
|
||||
onScanListener,
|
||||
offScanListener,
|
||||
onScanErrorListener,
|
||||
offScanErrorListener,
|
||||
setStatusListener,
|
||||
getStatus,
|
||||
startScan,
|
||||
stopScan,
|
||||
scanVideo,
|
||||
scanImage,
|
||||
scanImageFromFile,
|
||||
clear,
|
||||
});
|
||||
Reference in New Issue
Block a user