Startseite und Tests geupdated

src/js/init.js

@@ -23,6 +23,7 @@ applyPolyfills();
 import {WordRotatorSettingFragment} from "../module/Application/pwa/js/Fragment/WordRotatorSettingFragment";
 
 import './settings'
+import {SoundManager} from "./lib/pwa-assets";
 
 ThemeManager.addTheme(new Theme('red', ''));
 ThemeManager.addTheme(new Theme("blue", "blue"));
@@ -57,6 +58,9 @@ LoginSite.addLoginAction = false;
 InitPromise.resolve(app).then(function(){
     SettingsSite.settingsAction.showFor = MenuAction.SHOW_ALWAYS;
 
+    let soundManager = SoundManager.getInstance();
+    soundManager.play(SoundManager.CHANNELS.MUSIC, {audio: "sound/brightAndBeautifull__.mp3", loop: true, volume: 0.3});
+
     app.start(SynchronizeSite);
     Translator.setLanguage("de");
 });

src/js/lib/pwa-assets.js

@@ -109,6 +109,123 @@ class ScaleHelper {
     }
 }
 
+class SoundManager {
+    static getInstance() {
+        if (Helper.isNull(SoundManager.instance)) {
+            SoundManager.instance = new SoundManager();
+        }
+        return SoundManager.instance;
+    }
+
+    constructor() {
+        this.channels = {};
+    }
+
+    set(options, channel) {
+        channel = Helper.nonNull(channel, SoundManager.CHANNELS.DEFAULT);
+        let audioObject = Helper.nonNull(this.channels[channel], {});
+
+        if (typeof options === "string") {
+            options = {audio: options};
+        }
+
+        let audio = options.audio;
+        if (Helper.isNotNull(audio)) {
+            let src = null;
+            if (typeof audio === "string") {
+                src = audio;
+                audio = new Audio();
+                audioObject.loadedPromise = new Promise((resolve, reject) => {
+                    audio.addEventListener("loadeddata", () => {
+                        resolve();
+                    });
+                    audio.addEventListener("error", (e) => {
+                        console.warn(e);
+                        reject(e);
+                    });
+                });
+                audio.src = Helper.basePath(src);
+            }
+            else {
+                audioObject.loadedPromise = Promise.resolve();
+            }
+            this.stop(channel);
+            audioObject.audio = audio;
+            // audio.addEventListener('timeupdate', () => {
+            //     let buffer = 10;
+            //     if (this.channels[channel].audio === audio && this.channels[channel].loop) {
+            //         if (audio.currentTime > audio.duration - buffer) {
+            //             console.log("reset");
+            //             audio.currentTime = 0;
+            //             audio.play();
+            //         }
+            //     }
+            // }, false);
+        }
+        audioObject.muted = Helper.nonNull(options.muted, audioObject.muted, false);
+        audioObject.volume = Helper.nonNull(options.volume, audioObject.volume, 1);
+        audioObject.loop = Helper.nonNull(options.loop, audioObject.loop, false);
+        audioObject.timeOffset = Helper.nonNull(options.timeOffset, audioObject.timeOffset, 0);
+
+        this.channels[channel] = audioObject;
+        this._update(channel);
+
+        return this.channels[channel];
+    }
+
+    play(channel, audioOrOptions) {
+        channel = Helper.nonNull(channel, SoundManager.CHANNELS.DEFAULT);
+        if (Helper.isNull(audioOrOptions)) {
+            audioOrOptions = {};
+        } else if (!(typeof audioOrOptions === "object")) {
+            audioOrOptions = {
+                audio: audioOrOptions
+            };
+        }
+        audioOrOptions.timeOffset = Helper.nonNull(audioOrOptions.timeOffset, 0);
+
+        this.stop(channel);
+        this.set(audioOrOptions, channel);
+        // this._update(channel);
+
+        if (!this.channels[channel].muted) {
+            this.channels[channel].audio.play();
+        }
+        return this.channels[channel];
+    }
+
+    stop(channel) {
+        channel = Helper.nonNull(channel, SoundManager.CHANNELS.DEFAULT);
+
+        let oldAudio = this.channels[channel];
+        if (oldAudio != null) {
+            oldAudio.audio.pause();
+        }
+    }
+
+    _update(channel) {
+        let audioObject = this.channels[channel];
+
+        audioObject.audio.currentTime = Helper.nonNull(audioObject.timeOffset, audioObject.audio.currentTime);
+        audioObject.audio.loop = Helper.nonNull(audioObject.loop, audioObject.audio.loop);
+        audioObject.audio.volume = Helper.nonNull(audioObject.volume, audioObject.audio.volume);
+        if (audioObject.muted) {
+            this.stop(channel);
+        }
+    }
+
+    get(channel) {
+        channel = Helper.nonNull(channel, SoundManager.CHANNELS.DEFAULT);
+        return this.channels[channel];
+    }
+}
+
+SoundManager.CHANNELS = {
+    MUSIC: "music",
+    SOUND: "sound",
+    DEFAULT: "default"
+};
+
 class TabbedFragment extends Fragment {
     constructor(site) {
         super(site, 'pwaAssets/html/fragment/tabbedFragment.html');
@@ -174,4 +291,4 @@ class TabbedFragment extends Fragment {
     }
 }
 
-export { DelayPromise, RotateHelper, ScaleHelper, TabbedFragment };
+export { DelayPromise, RotateHelper, ScaleHelper, SoundManager, TabbedFragment };

src/js/lib/pwa-lib.js

@@ -872,10 +872,12 @@ class Helper {
     }
 
     static nonNull(val1, val2) {
-        if (Helper.isNotNull(val1)) {
-            return val1;
+        for (let i = 0; i < arguments.length; i++) {
+            if (Helper.isNotNull(arguments[i])) {
+                return arguments[i];
+            }
         }
-        return val2;
+        return null;
     }
 
     static notEmpty(value) {