XMDS: fix negative adjustment and cater for 1 minute collection

fixes to xibosignage/xibo#3530
xibosignage · Oct 14, 2024 · 67e1b38 · 67e1b38
1 parent 48037eb
commit 67e1b38
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/Xmds/Soap.php b/lib/Xmds/Soap.php
@@ -3215,7 +3215,12 @@ private function createDisplayAlert(\DomElement $alertNode)
      */
     protected function collectionIntervalWithOffset(int $collectionInterval): int
     {
-        $offset = $this->display->displayId % 20;
-        return $collectionInterval + ($offset < 10 ? ($offset * -1) : $offset);
+        if ($collectionInterval <= 60) {
+            $offset = $this->display->displayId % 10;
+            return $collectionInterval + ($offset < 5 ? (($offset * -1) - 5) : $offset);
+        } else {
+            $offset = $this->display->displayId % 20;
+            return $collectionInterval + ($offset < 10 ? (($offset * -1) -10) : $offset);
+        }
     }
 }