Commit f2013ea7 authored by huoshizhe's avatar huoshizhe

feat: 适配

parent 34d444db
...@@ -83,6 +83,7 @@ cc.Class({ ...@@ -83,6 +83,7 @@ cc.Class({
// this.initStoryBoxView({ // this.initStoryBoxView({
// coursewareId: 18307 // coursewareId: 18307
// }); // });
// this.bundleType = 'StoryBox';
}, },
asyncDelayLog(str) { asyncDelayLog(str) {
...@@ -105,6 +106,7 @@ cc.Class({ ...@@ -105,6 +106,7 @@ cc.Class({
const { bundleInfoList, defaultBundleIdx, bundleType, bundleInfo } = JSON.parse(jsonStr); const { bundleInfoList, defaultBundleIdx, bundleType, bundleInfo } = JSON.parse(jsonStr);
if (bundleType == 'PetRoom') { if (bundleType == 'PetRoom') {
this.bundleType = 'PetRoom';
this.baseUrl = bundleInfo.baseUrl; this.baseUrl = bundleInfo.baseUrl;
this.token = bundleInfo.token; this.token = bundleInfo.token;
this.homework_id = bundleInfo.homework_id; this.homework_id = bundleInfo.homework_id;
...@@ -114,6 +116,7 @@ cc.Class({ ...@@ -114,6 +116,7 @@ cc.Class({
this.initPetRoomView(bundleInfo); this.initPetRoomView(bundleInfo);
} else if (bundleType == "StoryBox") { } else if (bundleType == "StoryBox") {
this.bundleType = 'StoryBox';
const descLabel = cc.find('middleLayer/storyBox/menu/menuBase/title/name'); const descLabel = cc.find('middleLayer/storyBox/menu/menuBase/title/name');
descLabel.getComponent(cc.Label).string = bundleInfo.coursewareDescription; descLabel.getComponent(cc.Label).string = bundleInfo.coursewareDescription;
...@@ -123,6 +126,7 @@ cc.Class({ ...@@ -123,6 +126,7 @@ cc.Class({
this.baseUrl = bundleInfo.baseUrl; this.baseUrl = bundleInfo.baseUrl;
this.initStoryBoxView(bundleInfo); this.initStoryBoxView(bundleInfo);
} else { } else {
this.bundleType = 'WW';
// WW模板 // WW模板
this.bundleInfoList = bundleInfoList; this.bundleInfoList = bundleInfoList;
this.jumpToBundleByIndex(defaultBundleIdx); this.jumpToBundleByIndex(defaultBundleIdx);
...@@ -569,27 +573,23 @@ cc.Class({ ...@@ -569,27 +573,23 @@ cc.Class({
const middleLayer = cc.find('middleLayer'); const middleLayer = cc.find('middleLayer');
this.hideWaitingLetters(); this.hideWaitingLetters();
callback && callback(); callback && callback();
if (this.bundleType == 'StoryBox') {
canvas.getComponent(cc.Widget).updateAlignment(); canvas.getComponent(cc.Widget).updateAlignment();
middleLayer.getComponent(cc.Widget).updateAlignment();
const frameSize = cc.view.getFrameSize(); const frameSize = cc.view.getFrameSize();
console.log(`Canvas.size = ${canvas.width}, ${canvas.height}`); console.log(`Canvas.size = ${canvas.width}, ${canvas.height}`);
console.log(`frameSize.size = ${frameSize.width}, ${frameSize.height}`); console.log(`frameSize.size = ${frameSize.width}, ${frameSize.height}`);
const canvasComponent = canvas.getComponent(cc.Canvas); console.log(`middleLayer.size = ${middleLayer.width}, ${middleLayer.height}`);
const scale = (middleLayer.width / frameSize.width);
console.log('scale = ' + scale);
const middleLayerWidget = middleLayer.getComponent(cc.Widget);
middleLayerWidget.isAlignHorizontalCenter = true; // Boolean 是否水平方向对齐中点,开启此选项会将水平方向其他对齐选项取消。
middleLayerWidget.isAlignVerticalCenter = true; // Boolean 是否垂直方向对齐中点,开启此项会将垂直方向其他对齐选项取消。
// middleLayer.removeComponent(cc.Widget); // middleLayer.removeComponent(cc.Widget);
// middleLayer.width = frameSize.width; middleLayer.width = frameSize.width * scale;
// middleLayer.height = frameSize.height; middleLayer.height = frameSize.height * scale;
if (!canvasComponent.fitHeight && !canvasComponent.fitWidth) {
console.log('汪汪汪 1')
} else if (!canvasComponent.fitHeight) {
console.log('汪汪汪 2')
// const heightOffset = ((canvas.width / frameSize.size.width) * frameSize.size.height - canvas.height) / 2;
// console.log('heightOffset = ' + heightOffset);
// middleLayer.getComponent(cc.Widget).top = -heightOffset;
// middleLayer.getComponent(cc.Widget).bottom = -heightOffset;
// middleLayer.getComponent(cc.Widget).updateAlignment();
} else if (!canvasComponent.fitWidth) {
console.log('汪汪汪 3')
} else {
console.log('汪汪汪 4')
} }
}); });
}); });
......
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