Commit e6de90f3 authored by liujiangnan's avatar liujiangnan

feat: 拆分分支

parent 380681d7
......@@ -27,7 +27,7 @@ cc.Class({
}, 0);
layout.width = totalWidth;
const baseUrl = 'https://staging-teach.ireadabc.com';
const baseUrl = 'http://openapi.iteachabc.com';
const uri = '/api/template/v1/middleLayer_for_debug'
const reqData = {};
......@@ -36,7 +36,9 @@ cc.Class({
this.callNetworkApiGet(baseUrl, uri, reqData, (respData) => {
const data = JSON.parse(respData);
let configData = data.data.conf.web_desktop;
if (cc.sys.os == cc.sys.OS_IOS) {
if (cc.sys.isBrowser) {
configData = data.data.conf.web_desktop;
} else if (cc.sys.os == cc.sys.OS_IOS) {
configData = data.data.conf.ios;
} else if (cc.sys.os == cc.sys.OS_ANDROID) {
configData = data.data.conf.android;
......
......@@ -79,18 +79,6 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.restore();
}
}
callOcMethod(method, param) {
const paramStr = JSON.stringify(param);
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) {
return jsb.reflection.callStaticMethod('RootViewController', `${method}:`, paramStr);
} else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_ANDROID) {
return jsb.reflection.callStaticMethod('com/iplayabc/cocos/AppActivity', method, '(Ljava/lang/String;)Ljava/lang/String;', paramStr);
} else if (cc.sys.isNative && cc.sys.os == cc.sys.OS_WINDOWS) {
console.log('汪汪汪')
} else {
console.warn('非源生环境');
}
}
initSize() {
// 注意cc.winSize只有在适配后(修改fitHeight/fitWidth后)才能获取到正确的值,因此使用cc.getFrameSize()来获取初始的屏幕大小
let screen_size = cc.view.getFrameSize().width / cc.view.getFrameSize().height
......@@ -163,37 +151,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
globalThis.aaa = this;
const that = this;
// @ts-ignores
window.air = window.air || {};
// @ts-ignores
window.air.getEngineInfoCallback = function(res) {
let isDev;
if(typeof(res) == 'string') {
isDev = JSON.parse(res).isDev;
} else {
isDev = res.isDev;
}
console.log('isDev ' +(+isDev));
if (+isDev) {
that.BASE_URL = 'https://staging-teach.ireadabc.com';
} else {
that.BASE_URL = 'https://iteachabc.com';
}
console.log(111111);
that.initialized();
}
// @ts-ignores
const success = this.callOcMethod('getEngineInfo');
if (success) {
console.log("callOcMethod('getEngineInfo') success" + success);
} else {
console.log("callOcMethod('getEngineInfo') error" + success);
}
if (!cc.sys.isNative) {
// @ts-ignores
window.air.getEngineInfoCallback({isDev: 1})
}
this.BASE_URL = 'http://openapi.iteachabc.com';
this.initialized();
}
initBg() {
// const bgNode = cc.find('Canvas/MainScene/SpaceView/bg');
......@@ -367,6 +327,9 @@ export default class SceneComponent extends MyCocosSceneComponent {
resp = JSON.parse(resp);
if (resp.msg == 'success') {
let { rows } = resp;
console.log('-----------------');
console.log(rows);
console.log('-----------------');
rows = rows.filter(r => r.has_courseware);
console.log('LetterView', rows);
ctx.LetterViewData = rows;
......
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