Commit fc1185ad authored by liujiangnan's avatar liujiangnan

debug

parent bb6ee648
...@@ -56,10 +56,9 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -56,10 +56,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
} }
async startStep2() { async startStep2() {
await Promise.all([ const ps1 = this.asyncPlayAudioByUrl(this.data.pageArr[this.currentPageIdx].hotZoneItemArr[this.currentPartIdx].audio_url);
this.asyncPlayAudioByUrl(this.data.pageArr[this.currentPageIdx].hotZoneItemArr[this.currentPartIdx].audio_url), const ps2 = this.checkPart();
this.checkPart() await Promise.all([ ps1, ps2 ]);
]);
const middleLayer = cc.find('middleLayer'); const middleLayer = cc.find('middleLayer');
if (middleLayer) { if (middleLayer) {
...@@ -78,22 +77,26 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -78,22 +77,26 @@ export default class SceneComponent extends MyCocosSceneComponent {
checkPage() { checkPage() {
if (!window["courseware"] || cc.sys.isBrowser) { if (!window["courseware"] || cc.sys.isBrowser) {
// 没有中间层的话,直接判断为检测成功 // 没有中间层的话,直接判断为检测成功
return true; return;
} }
let checkSuccess = false;
// 定时三秒检测 // 定时三秒检测
const timeout = new Promise((resolve, reject) => { const timeout = new Promise((resolve, reject) => {
setTimeout(() => { setTimeout(() => {
window["courseware"].closeOsmoFingerRead(); if(!checkSuccess){
window["courseware"].closeOsmoFingerRead();
}
reject(new Error('checkpage timeout')); reject(new Error('checkpage timeout'));
}, 2800) }, 2800)
}); });
const pageId = this.data.pageArr[this.currentPageIdx].pageIdx; const pageId = this.data.pageArr[this.currentPageIdx].pageIdx;
const check = new Promise<void>((resolve, reject) => { const check = new Promise<void>((resolve, reject) => {
window["air"].osmoFingerReadCallback = (result) => { window["air"].osmoFingerReadCallback = (result) => {
const resultObj = JSON.parse(result); const resultObj = JSON.parse(result);
if (resultObj.page_id == pageId) { if (resultObj.page_id == pageId) {
// 检测成功 // 检测成功
checkSuccess = true;
window["courseware"].closeOsmoFingerRead(); window["courseware"].closeOsmoFingerRead();
resolve(); resolve();
} }
...@@ -128,6 +131,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -128,6 +131,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
const pageId = this.data.pageArr[this.currentPageIdx].pageIdx; const pageId = this.data.pageArr[this.currentPageIdx].pageIdx;
return new Promise<void>((resolve, reject) => { return new Promise<void>((resolve, reject) => {
window["air"].osmoFingerReadCallback = (result) => { window["air"].osmoFingerReadCallback = (result) => {
this.showTips("===========");
const resultObj = JSON.parse(result); const resultObj = JSON.parse(result);
const p = resultObj.finger_pos_in_page; const p = resultObj.finger_pos_in_page;
if (p.x == -1 || p.y == -1) { if (p.x == -1 || p.y == -1) {
...@@ -248,7 +252,7 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -248,7 +252,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
initListener() { initListener() {
} }
asyncPlayAudioByUrl(url: string): Promise<void> { asyncPlayAudioByUrl(url: string) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.playAudioByUrl(url, () => { this.playAudioByUrl(url, () => {
resolve(); resolve();
......
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