Commit a29d1046 authored by Chen Jiping's avatar Chen Jiping

Merge branch 'master' of http://vcs.ireadabc.com/template/OP-03-2

parents 34af43a3 788708f8
...@@ -137,9 +137,16 @@ cc.Class({ ...@@ -137,9 +137,16 @@ cc.Class({
const preloadArr = this._imageResList.concat(this._audioResList).concat(this._animaResList); const preloadArr = this._imageResList.concat(this._audioResList).concat(this._animaResList);
cc.assetManager.loadAny(preloadArr, null, null, (err, data) => { cc.assetManager.loadAny(preloadArr, null, null, (err, data) => {
this.loadEnd();
if (window && window["air"]) { if (window && window["air"]) {
window["air"].hideAirClassLoading(); cc.find('Canvas').opacity = 0;
window.air.onCourseInScreen = (next) => {
cc.find('Canvas').opacity = 255;
this.loadEnd();
next();
}
window.air.hideAirClassLoading();
} else {
this.loadEnd();
} }
cc.debug.setDisplayStats(false); cc.debug.setDisplayStats(false);
...@@ -804,7 +811,7 @@ cc.Class({ ...@@ -804,7 +811,7 @@ cc.Class({
} }
let openRecognitionCamera = window.courseware.openRecognitionCamera; let openRecognitionCamera = window.courseware.openRecognitionCamera;
if (!openRecognitionCamera) { if (!openRecognitionCamera) {
console.log('openRecognitionCamera not found') console.log('openRecognitionCamera not found')
...@@ -999,6 +1006,12 @@ cc.Class({ ...@@ -999,6 +1006,12 @@ cc.Class({
showPhotoSuccess() { showPhotoSuccess() {
console.log(' in showPhotoSuccess') console.log(' in showPhotoSuccess')
this.hidePhotoBtn(); this.hidePhotoBtn();
if (window && window.courseware && window.courseware.closeRecognitionCamera) {
window.courseware.closeRecognitionCamera();
} else {
console.log('没有closeRecognitionCamera!!!');
}
}, },
getPhotoData(cb) { getPhotoData(cb) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment