Commit d8aad452 authored by liujiangnan's avatar liujiangnan

feat:

parent b4eb6424
...@@ -48,7 +48,7 @@ export default class NewClass extends middleLayerBase { ...@@ -48,7 +48,7 @@ export default class NewClass extends middleLayerBase {
} }
const res: any = await this.asyncCallNetworkApiGet('/api/application/v1/checkVersion', { const res: any = await this.asyncCallNetworkApiGet('/api/application/v1/checkVersion', {
pkg_name: 'com.iplayabc.reading', pkg_name: 'com.iplayabc.ngt',
platform: platform platform: platform
}); });
return JSON.parse(res).data; return JSON.parse(res).data;
...@@ -82,17 +82,18 @@ export default class NewClass extends middleLayerBase { ...@@ -82,17 +82,18 @@ export default class NewClass extends middleLayerBase {
cc.find('middleLayer/BtnRight').active = false; cc.find('middleLayer/BtnRight').active = false;
cc.find('middleLayer/BtnLeft').active = false; cc.find('middleLayer/BtnLeft').active = false;
cc.find('middleLayer/Page').active = false;
cc.find('middleLayer/ExitBtn').active = false; cc.find('middleLayer/ExitBtn').active = false;
if (this.type == 'aixuebao') { // if (this.type == '') {
await this.asyncCallNetworkApiGet(`/api/aixuebao/v1/engine/active`, { // await this.asyncCallNetworkApiGet(`/api/aixuebao/v1/engine/active`, {
engineid: this.engine_uuid, // engineid: this.engine_uuid,
product: 'cartoon' // product: 'ngt'
}); // });
} // }
const str:any = await this.asyncCallNetworkApiGet(`/api/cartoon/v1/engine/bindinfo`, { const str:any = await this.asyncCallNetworkApiGet(`/api/ngt/v1/engine/bindinfo`, {
engine_id: this.engine_uuid engine_id: this.engine_uuid
}); });
const resObj = JSON.parse(str); const resObj = JSON.parse(str);
...@@ -101,7 +102,7 @@ export default class NewClass extends middleLayerBase { ...@@ -101,7 +102,7 @@ export default class NewClass extends middleLayerBase {
cc.sys.localStorage.setItem('activeSyllabuses', sylles); cc.sys.localStorage.setItem('activeSyllabuses', sylles);
this.showWaitingLetters(); this.showWaitingLetters();
this.loadOnlineBundle("cartoon_main"); this.loadOnlineBundle("ngt_main");
} else { } else {
cc.find(`middleLayer/activeLayer`).active = true; cc.find(`middleLayer/activeLayer`).active = true;
} }
...@@ -113,7 +114,7 @@ export default class NewClass extends middleLayerBase { ...@@ -113,7 +114,7 @@ export default class NewClass extends middleLayerBase {
async loadMainPage() { async loadMainPage() {
this.showLoading(); this.showLoading();
const str:any = await this.asyncCallNetworkApiGet(`/api/cartoon/v1/engine/bindinfo`, { const str:any = await this.asyncCallNetworkApiGet(`/api/ngt/v1/engine/bindinfo`, {
engine_id: this.engine_uuid engine_id: this.engine_uuid
}); });
this.hideLoading(); this.hideLoading();
...@@ -122,7 +123,7 @@ export default class NewClass extends middleLayerBase { ...@@ -122,7 +123,7 @@ export default class NewClass extends middleLayerBase {
if (sylles) { if (sylles) {
cc.sys.localStorage.setItem('activeSyllabuses', sylles); cc.sys.localStorage.setItem('activeSyllabuses', sylles);
this.showWaitingLetters(); this.showWaitingLetters();
this.loadOnlineBundle("cartoon_main"); this.loadOnlineBundle("ngt_main");
} else { } else {
cc.find(`middleLayer/activeLayer`).active = true; cc.find(`middleLayer/activeLayer`).active = true;
} }
...@@ -137,10 +138,11 @@ export default class NewClass extends middleLayerBase { ...@@ -137,10 +138,11 @@ export default class NewClass extends middleLayerBase {
} }
cc.find('middleLayer/BtnRight').active = false; cc.find('middleLayer/BtnRight').active = false;
cc.find('middleLayer/BtnLeft').active = false; cc.find('middleLayer/BtnLeft').active = false;
cc.find('middleLayer/Page').active = false;
cc.find('middleLayer/ExitBtn').active = false; cc.find('middleLayer/ExitBtn').active = false;
this.showWaitingLetters(); this.showWaitingLetters();
this.loadOnlineBundle("cartoon_main"); this.loadOnlineBundle("ngt_main");
}, 0.5) }, 0.5)
buttonOnClick(cc.find('middleLayer/BtnRight'), () => { buttonOnClick(cc.find('middleLayer/BtnRight'), () => {
...@@ -184,7 +186,7 @@ export default class NewClass extends middleLayerBase { ...@@ -184,7 +186,7 @@ export default class NewClass extends middleLayerBase {
this.showLoading(); this.showLoading();
const input = cc.find('middleLayer/activeLayer/active_bg/active_input').getComponent(cc.EditBox); const input = cc.find('middleLayer/activeLayer/active_bg/active_input').getComponent(cc.EditBox);
const activeCode = input.textLabel.string; const activeCode = input.textLabel.string;
const res:any = await this.asyncCallNetworkApiPost(`/api/cartoon/v1/engine/bind`, { const res:any = await this.asyncCallNetworkApiPost(`/api/ngt/v1/engine/bind`, {
engine_id: this.engine_uuid, book_code: activeCode, engine_id: this.engine_uuid, book_code: activeCode,
}); });
if (res && res.code == 200) { if (res && res.code == 200) {
......
...@@ -73,15 +73,30 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -73,15 +73,30 @@ export abstract class middleLayerBase extends cc.Component {
}); });
} }
getConfigInfo(url, callback) {
const xhr = new XMLHttpRequest();
xhr.onreadystatechange = () => {
if (xhr.readyState == 4 && (xhr.status >= 200 && xhr.status < 400)) {
callback(JSON.parse(xhr.responseText));
}
};
console.warn('url = ' + `${url}/config.json`);
xhr.open('GET', `${url}/config.json`, true);
xhr.send();
}
ORG_ID; ORG_ID;
DOMAIN;
async getBaseUrl(callback) { async getBaseUrl(callback) {
const engineInfo = await this.getEngineInfo(); const engineInfo = await this.getEngineInfo();
const { isDev } = JSON.parse(engineInfo); const { isDev } = JSON.parse(engineInfo);
if (isDev == 1) { if (isDev == 1) {
this.ORG_ID = 515; this.ORG_ID = 516;
this.DOMAIN = "http://staging-teach.cdn.ireadabc.com/";
callback('http://staging-openapi.iteachabc.com'); callback('http://staging-openapi.iteachabc.com');
} else { } else {
this.ORG_ID = 514; this.ORG_ID = 510;
this.DOMAIN = "http://teach.cdn.ireadabc.com/";
callback('http://openapi.iteachabc.com'); callback('http://openapi.iteachabc.com');
} }
} }
...@@ -112,21 +127,29 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -112,21 +127,29 @@ export abstract class middleLayerBase extends cc.Component {
}); });
} }
loadOnlineBundle(bundleName) { loadOnlineBundle(bundleName, callback = null) {
this.callNetworkApiGet(`/api/template/v1/${bundleName}`, {}, (datastr) => { this.callNetworkApiGet(`/api/template/v2/${bundleName}`, {}, (datastr) => {
const data = JSON.parse(datastr); const data = JSON.parse(datastr).data;
let configData = null; let sceneName, version, bondleUrl = "";
if (cc.sys.os == cc.sys.OS_IOS) {
configData = data.data.conf.ios; const templateBaseUrl = `${this.DOMAIN}h5template/${data.name}/v${data.last_version}`;
} else if (cc.sys.os == cc.sys.OS_ANDROID) { this.getConfigInfo(templateBaseUrl, (conf) => {
configData = data.data.conf.android;
} else { if (cc.sys.os == cc.sys.OS_IOS) {
configData = data.data.conf.web_desktop; sceneName = conf.ios.sceneName;
} version = conf.ios.version;
const sceneName = configData.sceneName; bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
const version = configData.version; } else if (cc.sys.os == cc.sys.OS_ANDROID) {
const bondleUrl = configData.bondleUrl; sceneName = conf.android.sceneName;
this.loadBundle(sceneName, version, bondleUrl); version = conf.android.version;
bondleUrl = `${templateBaseUrl}/android/${conf.ios.sceneName}`;
} else {
sceneName = conf.android.sceneName;
version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`;
}
this.loadBundle(sceneName, version, bondleUrl, callback);
});
}); });
} }
currentBundleInfo = null; currentBundleInfo = null;
...@@ -234,22 +257,28 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -234,22 +257,28 @@ export abstract class middleLayerBase extends cc.Component {
} }
loadPageBundle(callback = null) { loadPageBundle(callback = null) {
let sceneName, version, bondleUrl = ""; let sceneName, version, bondleUrl = "";
if (cc.sys.os == cc.sys.OS_IOS) { const templateBaseUrl = `${this.DOMAIN}h5template/${this.courseItem.template_name}/v${this.courseItem.last_version}`;
sceneName = this.courseItem.conf.ios.sceneName; this.getConfigInfo(templateBaseUrl, (conf) => {
version = this.courseItem.conf.ios.version;
bondleUrl = this.courseItem.conf.ios.bondleUrl; if (cc.sys.os == cc.sys.OS_IOS) {
} else if (cc.sys.os == cc.sys.OS_ANDROID) { sceneName = conf.ios.sceneName;
sceneName = this.courseItem.conf.android.sceneName; version = conf.ios.version;
version = this.courseItem.conf.android.version; bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
bondleUrl = this.courseItem.conf.android.bondleUrl; } else if (cc.sys.os == cc.sys.OS_ANDROID) {
} else { sceneName = conf.android.sceneName;
sceneName = this.courseItem.conf.web_desktop.sceneName; version = conf.android.version;
version = this.courseItem.conf.web_desktop.version; bondleUrl = `${templateBaseUrl}/android/${conf.ios.sceneName}`;
bondleUrl = this.courseItem.conf.web_desktop.bondleUrl; } else {
} sceneName = conf.android.sceneName;
version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`;
}
this.loadBundle(sceneName, version, bondleUrl, callback);
});
this.loadBundle(sceneName, version, bondleUrl, callback);
} }
goPrePage() { goPrePage() {
this.goTarIndexPage(this.courseIndex - 1); this.goTarIndexPage(this.courseIndex - 1);
......
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