Commit ac4ee371 authored by limingzhe's avatar limingzhe

fix: debug

parent eec2dac2
...@@ -11,7 +11,7 @@ export default class NewClass extends middleLayerBase { ...@@ -11,7 +11,7 @@ export default class NewClass extends middleLayerBase {
course_id; course_id;
courseware_id; courseware_id;
backPageScene; backPageScene;
isRunCamp = false;
JRZY_ID = -1; //今日作业 JRZY_ID = -1; //今日作业
JRSX_ID = -2; //今日所学 JRSX_ID = -2; //今日所学
...@@ -58,11 +58,12 @@ export default class NewClass extends middleLayerBase { ...@@ -58,11 +58,12 @@ export default class NewClass extends middleLayerBase {
this.token = bundleInfo.token; this.token = bundleInfo.token;
this.course_id = bundleInfo.course_id; this.course_id = bundleInfo.course_id;
this.courseware_id = bundleInfo.courseware_id; this.courseware_id = bundleInfo.courseware_id;
// if (bundleInfo.homework_id != null && bundleInfo.syllabus_id != null && bundleInfo.user_id != null) { this.isRunCamp = bundleInfo.is_run_camp;
// this.setCurHomeworkData( bundleInfo.homework_id, bundleInfo.syllabus_id, bundleInfo.user_id); if (this.isRunCamp ) {
// this.initExitPanel(); this.setCurHomeworkData( bundleInfo.homework_id, bundleInfo.syllabus_id, bundleInfo.user_id);
// this.initNetworkLoading(); this.initExitPanel();
// } this.initNetworkLoading();
}
cc.sys.localStorage.setItem('student_token', bundleInfo.token); cc.sys.localStorage.setItem('student_token', bundleInfo.token);
...@@ -127,6 +128,7 @@ export default class NewClass extends middleLayerBase { ...@@ -127,6 +128,7 @@ export default class NewClass extends middleLayerBase {
exitBtn.on(cc.Node.EventType.TOUCH_END, () => { exitBtn.on(cc.Node.EventType.TOUCH_END, () => {
exitPanel.active = false; exitPanel.active = false;
this.isRunCamp = false;
this.curHomeworkId = null; this.curHomeworkId = null;
this.curSyllabusId = null; this.curSyllabusId = null;
this.curUserId = null; this.curUserId = null;
...@@ -211,11 +213,10 @@ export default class NewClass extends middleLayerBase { ...@@ -211,11 +213,10 @@ export default class NewClass extends middleLayerBase {
console.log(' in exitGame data: ', data); console.log(' in exitGame data: ', data);
console.log(' this.token: ', this.token); console.log(' this.token: ', this.token);
// if (this.curHomeworkId != null) { if (this.isRunCamp && this.curHomeworkId) {
this.showExitPanel();
// this.showExitPanel(); return;
// return; }
// }
// if (this.node) { // if (this.node) {
...@@ -410,6 +411,11 @@ export default class NewClass extends middleLayerBase { ...@@ -410,6 +411,11 @@ export default class NewClass extends middleLayerBase {
onHomeworkFinish(d1 = null, d2 = null) { onHomeworkFinish(d1 = null, d2 = null) {
if (this.isRunCamp) {
this.onHomeworkFinishRunCamp(d1, d2);
return;
}
console.log('in onHomeworkFinish'); console.log('in onHomeworkFinish');
let data = d1; let data = d1;
let callback = null; let callback = null;
...@@ -438,7 +444,7 @@ export default class NewClass extends middleLayerBase { ...@@ -438,7 +444,7 @@ export default class NewClass extends middleLayerBase {
onHomeworkFinish2(d1 = null, d2 = null) { onHomeworkFinishRunCamp(d1 = null, d2 = null) {
console.log('in onHomeworkFinish'); console.log('in onHomeworkFinish');
let data = d1; let data = d1;
...@@ -448,8 +454,10 @@ export default class NewClass extends middleLayerBase { ...@@ -448,8 +454,10 @@ export default class NewClass extends middleLayerBase {
callback = d1; callback = d1;
} }
if (this.curHomeworkId == null || this.curSyllabusId == null || this.curUserId == null) { if (this.curHomeworkId == null || this.curSyllabusId == null || this.curUserId == null) {
callback && callback(); callback && callback();
this.isRunCamp = false;
return; return;
} }
...@@ -471,6 +479,7 @@ export default class NewClass extends middleLayerBase { ...@@ -471,6 +479,7 @@ export default class NewClass extends middleLayerBase {
this.curSyllabusId = null; this.curSyllabusId = null;
this.curHomeworkId = null; this.curHomeworkId = null;
this.isRunCamp = false;
callback && callback(res); callback && callback(res);
}); });
......
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