Commit de2414a2 authored by liujiangnan's avatar liujiangnan

debug

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