🐛 [feat/rework-scania] #78 apply some adjustment for animations

Signed-off-by: JAGFx <[email protected]>
JAGFx · May 11, 2022 · 6efbf7a · 6efbf7a
1 parent 00fa622
commit 6efbf7a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 15 deletions.
diff --git a/src/assets/scss/dashboard/scania-next-gen/_display.scss b/src/assets/scss/dashboard/scania-next-gen/_display.scss
@@ -9,8 +9,8 @@
 	padding-top: 1rem;
 
 	// Fixme: Some blur apear for an unknown reason
-	mask-image: url("/img/dashboard/scania-next-gen/menu-area.svg");
-	mask-repeat: no-repeat;
+	//mask-image: url("/img/dashboard/scania-next-gen/menu-area.svg");
+	//mask-repeat: no-repeat;
 
 	display: flex;
 	align-items: center;
@@ -21,8 +21,6 @@
 	&.starting {
 		background:      url("/img/dashboard/scania-next-gen/6482891_619566292.png") no-repeat center;
 		background-size: 10rem;
-		background-position-y: 1rem;
-
 	}
 	&.on {
 		background: url("/img/dashboard/scania-next-gen/menu-on.png");

diff --git a/src/components/dashboards/scania-next-gen/display/ScaniaNextGenDisplay.vue b/src/components/dashboards/scania-next-gen/display/ScaniaNextGenDisplay.vue
@@ -1,12 +1,19 @@
 <template>
-  <div v-if="telemetry2.truck.ignitionIsTurnedOn" class="display on">
-    <div class="squareArea driveMode">
-      <div><i class="icon icon-scania-next-gen-standard-mode_white" /></div>
-      <div v-if="telemetry2.symbols.cruiseControlIsEnabled">
-        <i class="icon icon-scania-cruise_control_white" />
-      </div>
+  <div
+    class="display"
+    :class="{
+      starting: telemetry2.truck.ignitionStart,
+      on: telemetry2.truck.engineIsStarted
+    }"
+  >
+    <div v-if="telemetry2.truck.engineIsStarted" class="squareArea driveMode">
+      <i class="icon icon-scania-next-gen-standard-mode_white" />
+      <i
+        v-if="telemetry2.symbols.cruiseControlIsEnabled"
+        class="icon icon-scania-cruise_control_white"
+      />
     </div>
-    <div class="menu-selector w-100">
+    <div v-if="telemetry2.truck.engineIsStarted" class="menu-selector w-100">
       <div class="button tiny left white">
         <i class="icon icon-scania-next-gen-menu-warning_white_yellow_red" />
       </div>
@@ -38,9 +45,15 @@
         <i class="icon icon-scania-next-gen-settings" />
       </div>
     </div>
-    <component :is="currentMenu" v-if="currentMenu !== null" />
-    <div v-else class="menu h-100 default"></div>
-    <div class="programmable-field">
+    <component
+      :is="currentMenu"
+      v-if="currentMenu !== null && telemetry2.truck.engineIsStarted"
+    />
+    <div
+      v-else-if="telemetry2.truck.engineIsStarted"
+      class="menu h-100 default"
+    ></div>
+    <div v-if="telemetry2.truck.engineIsStarted" class="programmable-field">
       <div class="field">
         <i class="icon icon-scania-cruise_control_white" />
         <div class="data">
@@ -79,7 +92,7 @@
         </div>
       </div>
     </div>
-    <div class="squareArea shifter">
+    <div v-if="telemetry2.truck.engineIsStarted" class="squareArea shifter">
       <div>{{ telemetry2.truck.gearDisplayedWithoutShifterType }}</div>
       <div>{{ telemetry2.truck.shifterTypeLetter }}</div>
     </div>

diff --git a/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue b/src/components/dashboards/scania-next-gen/symbols/ScaniaNextGenGeneralWarningSymbols.vue
@@ -1,5 +1,9 @@
 <template>
   <div>
+    <Debug
+      >{{ telemetry2.truck.ignitionIsTurnedOn }}<br />
+      {{ telemetry2.truck.ignitionStart }}</Debug
+    >
     <div class="symbols indicator left">
       <div class="symbol green">
         <i
@@ -60,10 +64,13 @@
 </template>
 
 <script>
+import Debug from '@/components/dashboards/shared/Debug';
 import TelemetryMixin from '@/mixins/TelemetryMixin';
 
 export default {
   name: 'ScaniaNextGenGeneralWarningSymbols',
+  components: { Debug },
+
   mixins: [TelemetryMixin]
 };
 </script>