joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev

Browse Source
This commit is contained in:
zyy 2020-03-06 19:02:34 +08:00
commit b92b2ff786
3 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/jmapNew/config/skinCode/bejing_01.js
View File

@ -210,6 +210,32 @@ class SkinCode extends defaultStyle {
}
};
this[deviceType.MapCycleButtonVO] = {
// 是否显示
visible: true,
text: {
fontSize: 11, // 字体大小
fontWeight: 'normal', // 字体粗细
distance: 5 // 灯跟文字距离
},
subtitleText: {
fontSize: 11, // 字体大小
fontWeight: 'normal', // 字体粗细
distance: 17 // 等于副标题距离
},
lamp: {
lineDash: null, // 灯的包围框
borderShow: false, // 是否显示边框
stroke: '#FFFFFF', // 框的颜色
fill: 'rgba(0,0,0,0)', // 填充色
radiusR: 6, // 控制灯大小
controlColor: '#b5b3b3' // 控制灯颜色 (灰色)
},
OutFrame: {
}
};
this[deviceType.StationStand] = {
common: { // 通用属性
textFontSize: 8, // 站台默认字体大小

1
src/jmapNew/config/skinCode/ningbo_01.js
View File

@ -220,6 +220,7 @@ class SkinCode extends defaultStyle {
distance: 17 // 等于副标题距离
},
lamp: {
borderShow: true, // 是否显示边框
lineDash: null, // 灯的包围框
stroke: '#FFFFFF', // 框的颜色
fill: 'rgba(0,0,0,0)', // 填充色

29
src/jmapNew/shape/Automactic/index.js
View File

@ -76,21 +76,24 @@ export default class Automactic extends Group {
});
this.add(this.subtitleText);
}
const arcRect = this.getArcBoundingRect();
this.arcBorder = new Rect({
zlevel: this.zlevel,
z: this.z,
silent: true,
shape: arcRect,
style: {
lineDash: this.style.MapCycleButtonVO.lamp.lineDash,
stroke: this.style.MapCycleButtonVO.lamp.stroke,
fill: this.style.MapCycleButtonVO.lamp.fill
}
});
if (this.style.MapCycleButtonVO.lamp.borderShow) {
const arcRect = this.getArcBoundingRect();
this.arcBorder = new Rect({
zlevel: this.zlevel,
z: this.z,
silent: true,
shape: arcRect,
style: {
lineDash: this.style.MapCycleButtonVO.lamp.lineDash,
stroke: this.style.MapCycleButtonVO.lamp.stroke,
fill: this.style.MapCycleButtonVO.lamp.fill
}
});
this.add(this.arcBorder);
}
this.add(this.control);
this.add(this.text);
this.add(this.arcBorder);
}
// 设置状态