From 84114abcd58acabc37a121e9ce8d094e8d425a5b Mon Sep 17 00:00:00 2001 From: JAGFx Date: Sat, 9 Apr 2022 11:37:05 +0200 Subject: [PATCH] :sparkles: [feat/scania-next-gen] add scania next gen symbols Signed-off-by: JAGFx --- lib/config/config.json | 2 +- lib/sdk/scs_sdk_plugin_parsed_data.json | 3 +- .../scss/dashboard/_scania-next-gen.scss | 2 + .../dashboard/scania-next-gen/_symbols.scss | 97 +++++++++++++++++++ .../ScaniaNextGenDashboard.vue | 14 ++- .../symbols/ScaniaNextGenBodyworkSymbols.vue | 30 ++++++ .../ScaniaNextGenGeneralWarningSymbols.vue | 74 ++++++++++++++ .../symbols/ScaniaNextGenIndicatorSymbols.vue | 43 ++++++++ 8 files changed, 262 insertions(+), 3 deletions(-) create mode 100644 src/assets/scss/dashboard/scania-next-gen/_symbols.scss create mode 100644 src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenBodyworkSymbols.vue create mode 100644 src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue create mode 100644 src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenIndicatorSymbols.vue diff --git a/lib/config/config.json b/lib/config/config.json index ef42cde3..667d8c7b 100644 --- a/lib/config/config.json +++ b/lib/config/config.json @@ -1,6 +1,6 @@ { "general_refresh_rate" : 100, - "general_skin_on_load" : "JAGFx", + "general_skin_on_load" : "ScaniaNextGen", "general_h-shift-layout" : "h-shifter", "general_skin_locale" : "en-EN", "general_job_remaining" : "due_date", diff --git a/lib/sdk/scs_sdk_plugin_parsed_data.json b/lib/sdk/scs_sdk_plugin_parsed_data.json index c0e638bd..4e43db32 100644 --- a/lib/sdk/scs_sdk_plugin_parsed_data.json +++ b/lib/sdk/scs_sdk_plugin_parsed_data.json @@ -604,7 +604,8 @@ }, "odometer" : 108482.9609375, "electric" : { - "enabled" : true + "enabled" : true, + "start":true }, "wipers" : { "enabled" : false diff --git a/src/assets/scss/dashboard/_scania-next-gen.scss b/src/assets/scss/dashboard/_scania-next-gen.scss index 537b5b19..9a640867 100644 --- a/src/assets/scss/dashboard/_scania-next-gen.scss +++ b/src/assets/scss/dashboard/_scania-next-gen.scss @@ -6,6 +6,8 @@ @import "scania-next-gen/ad-blue-bar"; @import "scania-next-gen/fuel-gauge"; @import "scania-next-gen/water-temperature-gauge"; + @import "scania-next-gen/symbols"; + position: relative; &.wrapper { diff --git a/src/assets/scss/dashboard/scania-next-gen/_symbols.scss b/src/assets/scss/dashboard/scania-next-gen/_symbols.scss new file mode 100644 index 00000000..d46e1300 --- /dev/null +++ b/src/assets/scss/dashboard/scania-next-gen/_symbols.scss @@ -0,0 +1,97 @@ +/** + * @author: Emmanuel SMITH + * project: ets2-dashboard-skin + * file: _symbols.scss + * Date: 08/04/2022 + * Time: 08:42 + */ + +@import "variable"; + +.bodywork { + position: absolute; + left: 28rem; + top: 42.9rem; + display: flex; + width: 29.3rem; + justify-content: space-between; +} + +.indicator { + position: absolute; + //width: 39.3rem; + top: 13.4rem; + + &.symbols > .symbol { + font-size: 3rem; + background: transparent; + } + + &.left { + left: 20rem; + } + &.right { + left: 62.2rem; + } +} + +.general-warning { + position: absolute; + width: 39.3rem; + top: 13.4rem; + left: 23.8rem; + + .symbols { + justify-content: flex-start; + } + .symbols > .symbol { + width: 3.13rem; + font-size: 2.6rem; + background: transparent; + + .icon-scania-driver-safty-belt_red { + font-size: 2rem; + } + } +} + +.indicator-symbols.symbols { + display: block; + + .symbol { + position: absolute; + font-size: 2.6rem; + + &.c2 { left: 5.6rem; bottom: 13.3rem; } + &.c3 { left: 9.2rem; top: 42.9rem; } + &.c12 { right: 9.2rem; top: 42.9rem; } + &.c13 { right: 5.6rem; bottom: 13.3rem; } + &.c14 { right: 2.3rem; bottom: 14.7rem; } + } +} + +.symbols { + display: flex; + justify-content: center; + align-items: center; + + .symbol { + width: 3.2rem; + height: 2.5rem; + background: #434343; + margin-right: .35rem; + display: flex; + justify-content: center; + align-items: center; + font-size: 2rem; + + &.red { color: $cRed; } + &.yellow { color: $cYellow; } + &.green { color: $cGreen; } + &.blue { color: $cBlue; } + + &:last-child{ + margin-right: 0; + } + } +} \ No newline at end of file diff --git a/src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue b/src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue index 9edb303a..d5c62240 100644 --- a/src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue +++ b/src/components/dashboards/scania-next-gen/ScaniaNextGenDashboard.vue @@ -57,6 +57,12 @@ mode="bar" /> + + + + + + @@ -65,6 +71,9 @@ import Dashboard from '@/components/dashboards/Dashboard'; import ScaniaNextGenGaugeDisplay from '@/components/dashboards/scania-next-gen/gauges/ScaniaNextGenGaugeLeftDisplay'; import ScaniaNextGenGauges from '@/components/dashboards/scania-next-gen/gauges/ScaniaNextGenGauges'; import ScaniaNextGenAdBlueBar from '@/components/dashboards/scania-next-gen/ScaniaNextGenAdBlueBar'; +import ScaniaNextGenBodyworkSymbols from '@/components/dashboards/scania-next-gen/symbols/ScaniaNextGenBodyworkSymbols'; +import ScaniaNextGenGeneralWarningSymbols from '@/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols'; +import ScaniaNextGenIndicatorSymbols from '@/components/dashboards/scania-next-gen/symbols/ScaniaNextGenIndicatorSymbols'; import Bars from '@/components/dashboards/shared/Bars'; import TelemetryMixin from '@/mixins/TelemetryMixin'; @@ -75,7 +84,10 @@ export default { ScaniaNextGenGauges, ScaniaNextGenGaugeDisplay, ScaniaNextGenAdBlueBar, - Bars + Bars, + ScaniaNextGenBodyworkSymbols, + ScaniaNextGenGeneralWarningSymbols, + ScaniaNextGenIndicatorSymbols }, mixins: [TelemetryMixin] }; diff --git a/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenBodyworkSymbols.vue b/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenBodyworkSymbols.vue new file mode 100644 index 00000000..db91f320 --- /dev/null +++ b/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenBodyworkSymbols.vue @@ -0,0 +1,30 @@ + + + diff --git a/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue b/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue new file mode 100644 index 00000000..398f91d7 --- /dev/null +++ b/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue @@ -0,0 +1,74 @@ + + + diff --git a/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenIndicatorSymbols.vue b/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenIndicatorSymbols.vue new file mode 100644 index 00000000..0b45dab9 --- /dev/null +++ b/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenIndicatorSymbols.vue @@ -0,0 +1,43 @@ + + +