Commit 41985056 authored by liujiangnan's avatar liujiangnan

debug

parent 3d40e04c
...@@ -12,21 +12,7 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -12,21 +12,7 @@ export abstract class middleLayerBase extends cc.Component {
IS_BUNDLE_LOADING = false; IS_BUNDLE_LOADING = false;
onMiddleLayerLoadingFinish() { onMiddleLayerLoadingFinish() {
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) {
jsb.reflection.callStaticMethod(
"RootViewController",
"getMiddleLayerInfoFinish:",
""
);
}
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_ANDROID) {
jsb.reflection.callStaticMethod(
"com/iplayabc/cocos/AppActivity",
"getMiddleLayerInfoFinish",
"(Ljava/lang/String;)Ljava/lang/String;",
""
);
}
} }
callNetworkApiPost(uri, _data, callBack) { callNetworkApiPost(uri, _data, callBack) {
...@@ -143,19 +129,9 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -143,19 +129,9 @@ export abstract class middleLayerBase extends cc.Component {
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.isNative && cc.sys.os == cc.sys.OS_IOS) { sceneName = conf.android.sceneName;
sceneName = conf.ios.sceneName; version = "";
version = conf.ios.version; bondleUrl = `${templateBaseUrl}/web_desktop`;
bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
} else if (cc.sys.isNative && 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;
version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`;
}
this.loadBundle(sceneName, version, bondleUrl, callback); this.loadBundle(sceneName, version, bondleUrl, callback);
}); });
}); });
...@@ -194,10 +170,7 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -194,10 +170,7 @@ export abstract class middleLayerBase extends cc.Component {
this.setNodeListVisible(); this.setNodeListVisible();
// 手机端强制垃圾回收 // 手机端强制垃圾回收
if (cc.sys.isNative && (cc.sys.os == cc.sys.OS_IOS || cc.sys.os == cc.sys.OS_ANDROID)) {
cc.sys.garbageCollect();
}
cc.assetManager.loadBundle(bondleUrl, { version: version }, async (err, bundle) => { cc.assetManager.loadBundle(bondleUrl, { version: version }, async (err, bundle) => {
bundle.loadScene(sceneName, null, null, (err, scene) => { bundle.loadScene(sceneName, null, null, (err, scene) => {
...@@ -219,13 +192,7 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -219,13 +192,7 @@ export abstract class middleLayerBase extends cc.Component {
const destroyer = cc.instantiate(cc.find('middleLayer/Destroyer')); const destroyer = cc.instantiate(cc.find('middleLayer/Destroyer'));
destroyer.parent = cc.find('Canvas'); destroyer.parent = cc.find('Canvas');
destroyer.active = true; destroyer.active = true;
// 手机端强制垃圾回收
if (cc.sys.isNative && (cc.sys.os == cc.sys.OS_IOS || cc.sys.os == cc.sys.OS_ANDROID)) {
cc.sys.garbageCollect();
}
callback && callback(); callback && callback();
this.IS_BUNDLE_LOADING = false; this.IS_BUNDLE_LOADING = false;
this.oldSceneName = sceneName; this.oldSceneName = sceneName;
...@@ -347,19 +314,9 @@ export abstract class middleLayerBase extends cc.Component { ...@@ -347,19 +314,9 @@ export abstract class middleLayerBase extends cc.Component {
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.isNative && cc.sys.os == cc.sys.OS_IOS) { sceneName = conf.android.sceneName;
sceneName = conf.ios.sceneName; version = "";
version = conf.ios.version; bondleUrl = `${templateBaseUrl}/web_desktop`;
bondleUrl = `${templateBaseUrl}/ios/${conf.ios.sceneName}`;
} else if (cc.sys.isNative && 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;
version = "";
bondleUrl = `${templateBaseUrl}/web_desktop`;
}
this.loadBundle(sceneName, version, bondleUrl, callback); this.loadBundle(sceneName, version, bondleUrl, callback);
}); });
} }
......
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