Commit de2414a2 authored by liujiangnan's avatar liujiangnan

debug

parent e2e55651
......@@ -4864,8 +4864,8 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "openOSMO",
"_N$string": "openOSMO",
"_string": "横屏",
"_N$string": "横屏",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
......@@ -6348,8 +6348,8 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "closeOSMO",
"_N$string": "closeOSMO",
"_string": "竖屏",
"_N$string": "竖屏",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
......
......@@ -106,17 +106,18 @@ export default class NewClass extends middleLayerBase {
cc.find("middleLayer/ui/ProgressLabel").active = true;
cc.find('middleLayer/ui/loadingProgress').active = true;
let platform = "web_desktop";
if (cc.sys.os == cc.sys.OS_IOS) {
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_IOS) {
platform = "ios";
} else if (cc.sys.os == cc.sys.OS_ANDROID) {
}
if (cc.sys.isNative && cc.sys.os == cc.sys.OS_ANDROID) {
platform = "android";
}
this.callNetworkApiGet(`/api/syllabus/v1/allbundles`, { orgid: 483, platform }, (datastr) => {
this.callNetworkApiGet(`/api/syllabus/v1/allbundles`, { orgid: 512, platform }, (datastr) => {
const data = JSON.parse(datastr);
if (data.rows && data.rows.length > 0) {
this.preloadCount += data.rows.length;
}
this.callNetworkApiGet(`/api/syllabus/v1/allresources`, { orgid: 483 }, (datastr1) => {
this.callNetworkApiGet(`/api/syllabus/v1/allresources`, { orgid: 512 }, (datastr1) => {
const data1 = JSON.parse(datastr1);
if (data1.rows && data1.rows.length > 0) {
this.preloadCount += data1.rows.length;
......@@ -210,24 +211,24 @@ export default class NewClass extends middleLayerBase {
preloadSource(array) {
const rows = array || [];
const batchLoad = () => {
let tempArr = rows.splice(0, 10);
let len = tempArr.length;
for (let i = 0; i < tempArr.length; i++) {
cc.assetManager.loadRemote(tempArr[i], (err, texture) => {
let tempArr = rows.map(item => {
return {url: item};
});
const label = cc.find("middleLayer/ui/ProgressLabel").getComponent(cc.Label);
const loadingProgress = cc.find('middleLayer/ui/loadingProgress');
cc.assetManager.preloadAny(tempArr, null, (finished, total)=>{
label.string = `正在加载:${finished} / ${total}`;
loadingProgress.getComponent(cc.ProgressBar).progress = finished / total;
}, (err) => {
if (err) {
console.log(err)
}
this.loadedCount++;
this.updateProcessBar();
if (i === len - 1) {
batchLoad();
}
cc.find("middleLayer/ui/ProgressLabel").active = false;
loadingProgress.active = false;
this.showLog("资源全部加载完成");
});
}
}
batchLoad();
}
async getUserInfo() {
return {
......@@ -535,11 +536,11 @@ export default class NewClass extends middleLayerBase {
});
cc.find('middleLayer/ui/BtnOpenOsmo').on('click', () => {
(<any>window).courseware.openOsmo();
(<any>window).courseware.onConfigurationPortrait();
});
cc.find('middleLayer/ui/BtnCloseOsmo').on('click', () => {
(<any>window).courseware.closeOsmo();
(<any>window).courseware.onConfigurationLandscape();
});
cc.find('middleLayer/ui/BtnOpenFinger').on('click', () => {
......
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