hoffmation-base 3.2.12 → 3.2.15

package/lib/services/Sonos/sonos-service.js

@@ -86,9 +86,13 @@ class SonosService {
             logging_1.ServerLogService.writeLog(enums_1.LogLevel.Alert, 'SonosService noch nicht initialisiert.');
         }
         polly_service_1.PollyService.tts(pMessage, (networkPath, duration) => {
-            const hours = new Date().getHours();
-            const volume = hours < 10 || hours > 22 ? 40 : 80;
             for (const deviceName in this.ownDevices) {
+                const snDevice = this.ownDevices[deviceName];
+                const room = snDevice.room;
+                const timeOfDay = time_callback_service_1.TimeCallbackService.dayType(room.settings.rolloOffset);
+                const volume = timeOfDay == enums_1.TimeOfDay.Night
+                    ? snDevice.settings.defaultNightAnounceVolume
+                    : snDevice.settings.defaultDayAnounceVolume;
                 this.ownDevices[deviceName].playOnDevice(networkPath, duration, volumeOverride > -1
                     ? volumeOverride
                     : Math.min(volume, this.ownDevices[deviceName].settings.maxPlayOnAllVolume));

package/lib/settingsObjects/deviceSettings/sonosDeviceSettings.d.ts

@@ -5,6 +5,18 @@ export declare class SonosDeviceSettings extends DeviceSettings {
      * @default 80
      */
     maxPlayOnAllVolume: number;
+    /**
+     * The default volume to inform of non critical stuff during daytime
+     * @type {number}
+     * @default 80
+     */
+    defaultDayAnounceVolume: number;
+    /**
+     * The default volume to inform of non critical stuff during nighttime
+     * @type {number}
+     * @default 80
+     */
+    defaultNightAnounceVolume: number;
     fromPartialObject(data: Partial<SonosDeviceSettings>): void;
     toJSON(): Partial<SonosDeviceSettings>;
 }

package/lib/settingsObjects/deviceSettings/sonosDeviceSettings.js

@@ -11,10 +11,24 @@ class SonosDeviceSettings extends deviceSettings_1.DeviceSettings {
          * @default 80
          */
         this.maxPlayOnAllVolume = 80;
+        /**
+         * The default volume to inform of non critical stuff during daytime
+         * @type {number}
+         * @default 80
+         */
+        this.defaultDayAnounceVolume = 80;
+        /**
+         * The default volume to inform of non critical stuff during nighttime
+         * @type {number}
+         * @default 80
+         */
+        this.defaultNightAnounceVolume = 40;
     }
     fromPartialObject(data) {
-        var _a;
+        var _a, _b, _c;
         this.maxPlayOnAllVolume = (_a = data.maxPlayOnAllVolume) !== null && _a !== void 0 ? _a : this.maxPlayOnAllVolume;
+        this.defaultDayAnounceVolume = (_b = data.defaultDayAnounceVolume) !== null && _b !== void 0 ? _b : this.defaultDayAnounceVolume;
+        this.defaultNightAnounceVolume = (_c = data.defaultNightAnounceVolume) !== null && _c !== void 0 ? _c : this.defaultNightAnounceVolume;
         super.fromPartialObject(data);
     }
     toJSON() {