.

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index b5f2ef1c14ae097b54ec2ddb16a744400cca1f7d..a9a7d7e70ea80e6ae5abe49b294eabaf159de679 100644 (file)
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-232.10227.8">
+  <component name="dataSourceStorageLocal" created-in="IU-233.13135.103">
     <data-source name="LFY(3).db" uuid="e5a3291d-855f-44b2-be41-76fe6b0c2136">
       <database-info product="SQLite" version="3.25.1" jdbc-version="2.1" driver-name="SQLite JDBC" driver-version="3.25.1" dbms="SQLITE" exact-version="3.25.1" exact-driver-version="3.25">
         <identifier-quote-string>&quot;</identifier-quote-string>

diff --git a/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml b/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml
index 43b34542ad4446225b985d7087c6fe6d748c492b..2b169be363169fee5bce4acaabeb92a3763036db 100644 (file)
--- a/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml
+++ b/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dataSource name="LFY_ZiGate.db">
-  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.49">
+  <database-model serializer="dbm" dbms="SQLITE" family-id="SQLITE" format-version="4.51">
     <root id="1"/>
     <collation id="2" parent="1" name="BINARY"/>
     <collation id="3" parent="1" name="NOCASE"/>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a021ecfb8edd3878bf7dcf4b05f8f69d0164b776..ba78ca5d5f5003d7beb5ef793d471d0c66623fea 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +5,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources.local.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/7a96a13f-795b-43c9-b1de-56e65d9fcf95.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/lib.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/lib.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/off.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/off.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/lib/scenes.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/scenes.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -238,6 +243,7 @@
   &quot;keyToString&quot;: {
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;Shell Script.Docker terminal.executor&quot;: &quot;Run&quot;,
     &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
     &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
     &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
@@ -247,6 +253,7 @@
     &quot;deletionFromPopupRequiresConfirmation&quot;: &quot;false&quot;,
     &quot;git-widget-placeholder&quot;: &quot;master&quot;,
     &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
     &quot;last_opened_file_path&quot;: &quot;D:/Works/rodadocavaco&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
@@ -1285,7 +1292,12 @@
       <workItem from="1697390209410" duration="2209000" />
       <workItem from="1697741970447" duration="3265000" />
       <workItem from="1699383159431" duration="1704000" />
-      <workItem from="1701371600778" duration="246000" />
+      <workItem from="1701371600778" duration="889000" />
+      <workItem from="1702993290238" duration="893000" />
+      <workItem from="1702998290347" duration="20000" />
+      <workItem from="1703319042563" duration="797000" />
+      <workItem from="1704125893623" duration="836000" />
+      <workItem from="1704215960754" duration="33000" />
     </task>
     <task id="LOCAL-00502" summary=".">
       <created>1641726946298</created>
@@ -1630,7 +1642,7 @@
       <option name="project" value="LOCAL" />
       <updated>1687259667913</updated>
     </task>
-    <option name="localTasksCounter" value="600" />
+    <option name="localTasksCounter" value="601" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/scripts/lib/lib.php b/scripts/lib/lib.php
index fd94442f6313e3d509d94fef900e5ff9051dea1e..ed4f5a08f49cff25354d174d213231eaffecf051 100644 (file)
--- a/scripts/lib/lib.php
+++ b/scripts/lib/lib.php
@@ -651,5 +651,5 @@ function gloria()
         return false;
     }
     $h = intval(date('H'));
-    return $h >= 12 && $h <= 17;
+    return $h >= 12 && $h <= 16;
 }

diff --git a/scripts/lib/off.php b/scripts/lib/off.php
index 029359fd5879a0876aa593b5f1005d3f7f3276a0..e3f1f2ce7c46c0dedeb3aae7e68356555b8d444d 100644 (file)
--- a/scripts/lib/off.php
+++ b/scripts/lib/off.php
@@ -39,8 +39,8 @@ function offSalon()
 
 function offBureau()
 {
-    stopHarmony();
     execScene('bureau/media/stop');
+    stopHarmony();
     shieldKillAll('bureau');
     shieldSleep('bureau');
 }

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index fa410e77e728b5aa3e46d94174cfec65348ef243..5e444bccc93f0bd2d1ffa50e9cee7a6779b0ee66 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -996,7 +996,7 @@ function wcMusic($volume)
     $d = date('w');
     if ($d == 4) {
         $music = 'New Morning';
-    } else if ($d == 3) {
+    } else if ($d == 2) {
         $music = 'Radio Michel';
     } else if ($d == 5) {
         $music = 'Samba';

diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php
index 20f48aa4375c72e8901da396dfd3c44a806cde52..63dfc8f99dcf728e79545f0ef4c6a48a34198233 100644 (file)
--- a/scripts/lib/shield.php
+++ b/scripts/lib/shield.php
@@ -50,10 +50,10 @@ function shieldRunActivity($device = null, $force = false)
         if ($onlySound) {
             harmonyActivity(HARMONY_MUSIQUE);
         } else {
-            harmonyActivity(HARMONY_TV);
             if (getState('bureauPlaying', '0') === '0') {
                 execScene('bureau/media/play');
             }
+            harmonyActivity(HARMONY_TV);
         }
     }
 }
@@ -320,7 +320,7 @@ function shieldGetApps()
 
 function shieldPlayingVideo($device = null)
 {
-    $videoApps = ['kodi', 'vlc', 'mycanal', 'amazonprime', 'netflix', 'arte', 'francetv', 'gamecast', 'twitch', 'youtube', 'dailymotion', 'vimeo', 'steamlink'];
+    $videoApps = ['kodi', 'vlc', 'mycanal', 'amazonprime', 'netflix', 'arte', 'francetv', 'gamecast', 'twitch', 'youtube', 'dailymotion', 'vimeo', 'steamlink', 'plex'];
     return in_array(shieldGetCurrentApp($device), $videoApps);
 }