Commit dcb39598 authored by liujiangnan's avatar liujiangnan

feat

parent 41985056
...@@ -279,16 +279,7 @@ export default class NewClass extends middleLayerBase { ...@@ -279,16 +279,7 @@ export default class NewClass extends middleLayerBase {
} }
async getOnlineVersion() { async getOnlineVersion() {
let platform = ''; let platform = 'web';
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) {
platform = 'ios';
} else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_ANDROID) {
platform = 'android';
} else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_WINDOWS) {
platform = 'windows';
} else {
platform = 'web';
}
const res: any = await this.asyncCallNetworkApiGet('/api/application/v1/checkVersion', { const res: any = await this.asyncCallNetworkApiGet('/api/application/v1/checkVersion', {
pkg_name: 'com.iplayabc.oxford.lite', pkg_name: 'com.iplayabc.oxford.lite',
...@@ -327,12 +318,7 @@ export default class NewClass extends middleLayerBase { ...@@ -327,12 +318,7 @@ export default class NewClass extends middleLayerBase {
preloadAll(onProgress, onComplete) { preloadAll(onProgress, onComplete) {
let platform = "web_desktop"; let platform = "web_desktop";
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) {
platform = "ios";
}
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_ANDROID) {
platform = "android";
}
this.callNetworkApiGet(`/api/syllabus/v1/allbundles`, { orgid: this.ORG_ID, platform }, (datastr) => { this.callNetworkApiGet(`/api/syllabus/v1/allbundles`, { orgid: this.ORG_ID, platform }, (datastr) => {
const data = JSON.parse(datastr); const data = JSON.parse(datastr);
this.batchPreloadScene(data.rows, [], onProgress, onComplete); this.batchPreloadScene(data.rows, [], onProgress, onComplete);
...@@ -707,19 +693,9 @@ export default class NewClass extends middleLayerBase { ...@@ -707,19 +693,9 @@ export default class NewClass extends middleLayerBase {
const templateBaseUrl = `${this.DOMAIN}h5template/${data.name}/v${data.last_version}`; const templateBaseUrl = `${this.DOMAIN}h5template/${data.name}/v${data.last_version}`;
this.getConfigInfo(templateBaseUrl, (conf) => { this.getConfigInfo(templateBaseUrl, (conf) => {
if (cc.sys.os == cc.sys.OS_IOS) {
sceneName = conf.ios.sceneName;
version = conf.ios.version;
bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
} else if (cc.sys.os == cc.sys.OS_ANDROID) {
sceneName = conf.android.sceneName;
version = conf.android.version;
bondleUrl = `${templateBaseUrl}/android/${conf.android.sceneName}`;
} else {
sceneName = conf.android.sceneName; sceneName = conf.android.sceneName;
version = ""; version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`; bondleUrl = `${templateBaseUrl}/web_desktop`;
}
this.loadBundle(sceneName, version, bondleUrl, () => { this.loadBundle(sceneName, version, bondleUrl, () => {
cc.find('middleLayer/ram').active = bundleName == 'NJ_YouLeChang'; cc.find('middleLayer/ram').active = bundleName == 'NJ_YouLeChang';
cc.find('middleLayer/cross').active = (bundleName == 'NJ_YouLeChang'&&this.gameModel=='cross'); cc.find('middleLayer/cross').active = (bundleName == 'NJ_YouLeChang'&&this.gameModel=='cross');
...@@ -741,20 +717,9 @@ export default class NewClass extends middleLayerBase { ...@@ -741,20 +717,9 @@ export default class NewClass extends middleLayerBase {
let sceneName, version, bondleUrl = ""; let sceneName, version, bondleUrl = "";
const templateBaseUrl = `${this.DOMAIN}h5template/${this.courseItem.template_name}/v${this.courseItem.last_version}`; const templateBaseUrl = `${this.DOMAIN}h5template/${this.courseItem.template_name}/v${this.courseItem.last_version}`;
this.getConfigInfo(templateBaseUrl, (conf) => { this.getConfigInfo(templateBaseUrl, (conf) => {
if (cc.sys.os == cc.sys.OS_IOS) {
sceneName = conf.ios.sceneName;
version = conf.ios.version;
bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
} else if (cc.sys.os == cc.sys.OS_ANDROID) {
sceneName = conf.android.sceneName;
version = conf.android.version;
bondleUrl = `${templateBaseUrl}/android/${conf.ios.sceneName}`;
} else {
sceneName = conf.android.sceneName; sceneName = conf.android.sceneName;
version = ""; version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`; bondleUrl = `${templateBaseUrl}/web_desktop`;
}
this.loadBundle(sceneName, version, bondleUrl, callback); this.loadBundle(sceneName, version, bondleUrl, callback);
}); });
}); });
......
...@@ -125,19 +125,6 @@ export function initRecorder() { ...@@ -125,19 +125,6 @@ export function initRecorder() {
var isSpeechToText; var isSpeechToText;
export function supportMethod (method, param) { export function supportMethod (method, param) {
if (cc.sys.isNative) {
// 原生调用
const paramStr = JSON.stringify(param);
if (cc.sys.os == cc.sys.OS_IOS) {
return jsb.reflection.callStaticMethod('RootViewController', `${method}:`, paramStr);
}
if (cc.sys.os == cc.sys.OS_ANDROID) {
return jsb.reflection.callStaticMethod('com/iplayabc/cocos/AppActivity', method, '(Ljava/lang/String;)Ljava/lang/String;', paramStr);
}
if (cc.sys.os == cc.sys.OS_WINDOWS) {
console.error('暂不支持此平台');
}
} else if (cc.sys.isBrowser) {
if(method == 'getEngineInfo'){ if(method == 'getEngineInfo'){
window.air.getEngineInfoCallback({isDev: 0, uuid: 'debug-njstar-xxxxxx'}); window.air.getEngineInfoCallback({isDev: 0, uuid: 'debug-njstar-xxxxxx'});
} else if (method == 'startTest') { } else if (method == 'startTest') {
...@@ -233,10 +220,4 @@ export function supportMethod (method, param) { ...@@ -233,10 +220,4 @@ export function supportMethod (method, param) {
} else{ } else{
console.error(`${method}方法还没有Mock数据,请联系技术支持人员添加`); console.error(`${method}方法还没有Mock数据,请联系技术支持人员添加`);
} }
} else {
// 其他环境
if(method == 'getEngineInfo'){
window.air.getEngineInfoCallback({isDev: 1, uuid: 'debug-xxxxxx-xxxxxx'});
}
}
} }
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