.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c89f585988fb2dd7bc52a5f1e8295f22098883d1..baaccaed390879d2c7ff0cedc57e2a9225ccd92e 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,10 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/remote.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/remote.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/tv.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/tv.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/bureau.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/bureau.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/rooms.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/rooms.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" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/tmdb.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/tmdb.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/scripts/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/shield.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -888,14 +888,7 @@
       <workItem from="1603811262372" duration="1988000" />
       <workItem from="1603958541180" duration="5032000" />
       <workItem from="1604042543878" duration="11137000" />
-      <workItem from="1604152329376" duration="14038000" />
-    </task>
-    <task id="LOCAL-00309" summary=".">
-      <created>1583309116308</created>
-      <option name="number" value="00309" />
-      <option name="presentableId" value="LOCAL-00309" />
-      <option name="project" value="LOCAL" />
-      <updated>1583309116308</updated>
+      <workItem from="1604152329376" duration="17258000" />
     </task>
     <task id="LOCAL-00310" summary=".">
       <created>1583413557785</created>
@@ -1233,7 +1226,14 @@
       <option name="project" value="LOCAL" />
       <updated>1604143127018</updated>
     </task>
-    <option name="localTasksCounter" value="358" />
+    <task id="LOCAL-00358" summary=".">
+      <created>1604224463669</created>
+      <option name="number" value="00358" />
+      <option name="presentableId" value="LOCAL-00358" />
+      <option name="project" value="LOCAL" />
+      <updated>1604224463669</updated>
+    </task>
+    <option name="localTasksCounter" value="359" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1283,12 +1283,16 @@
       <screen x="0" y="0" width="1707" height="920" />
     </state>
     <state x="740" y="229" key="#com.jetbrains.php.refactoring.extractMethod.PhpExtractMethodDialog#function0/0.0.1707.920@0.0.1707.920" timestamp="1604146905948" />
-    <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604143114614">
+    <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1604224431367">
       <screen x="0" y="0" width="1707" height="920" />
     </state>
-    <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1604143114614" />
+    <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1604224431367" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1602171117745" />
     <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1603961854066" />
+    <state x="635" y="216" key="FileChooserDialogImpl" timestamp="1604227698339">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state x="635" y="216" key="FileChooserDialogImpl/0.0.1707.920@0.0.1707.920" timestamp="1604227698339" />
     <state x="1114" y="443" key="NewPhpFileDialog" timestamp="1603958673068">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1297,10 +1301,10 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="781" y="165" key="SettingsEditor/0.0.2560.1040@0.0.2560.1040" timestamp="1596008871908" />
-    <state width="498" height="446" key="SwitcherDM" timestamp="1604161134101">
+    <state width="498" height="446" key="SwitcherDM" timestamp="1604228166964">
       <screen x="0" y="0" width="1707" height="920" />
     </state>
-    <state width="498" height="446" key="SwitcherDM/0.0.1707.920@0.0.1707.920" timestamp="1604161134101" />
+    <state width="498" height="446" key="SwitcherDM/0.0.1707.920@0.0.1707.920" timestamp="1604228166964" />
     <state x="655" y="270" width="816" height="530" key="Vcs.Push.Dialog.v2" timestamp="1595521362224">
       <screen x="0" y="0" width="1920" height="1160" />
     </state>

diff --git a/config/bureau.php b/config/bureau.php
index 26d7dcc17b0dcb02c894ff5ed943cb7bd7f4e7c4..c2e02c2d29f4d9a0e8535d24654de9de42bbc01d 100644 (file)
--- a/config/bureau.php
+++ b/config/bureau.php
@@ -10,6 +10,10 @@ config('SCREENSAVER', 'suncurve');
 config('SLEEPSCREEN', 15);
 config('VIDEOPLAYER_DEVICE', 'bureau');
 config('HIDEMASK_TIMEOUT', 250);
+//
+config('TVPLAYER', 'shield');
+config('VIDEOPLAYER', 'shield');
+
 
 if (DISPLAYINTERFACE) {
     $c = bureau();

diff --git a/config/rooms.php b/config/rooms.php
index 979a359bf3f5f8b0f450e5d26831125816185ff5..c7829d049162aa5134a4c3ba6c1e3c77f36fa68a 100644 (file)
--- a/config/rooms.php
+++ b/config/rooms.php
@@ -5,8 +5,9 @@ $rooms = array('home' => 'Maison', 'salon' => 'Salon', 'chambre' => 'Chambre', '
 function chambre($additionnalfavorites = array())
 {
     $favorites = [
-        ['type' => 'light', 'scene' => 'home/aulit', 'label' => 'Au lit â\98\85'],
+        ['type' => 'light', 'scene' => 'home/aulit', 'label' => 'Au lit â\98½'],
         ['type' => 'light', 'scene' => 'chambre/matin', 'label' => 'Matin ★'],
+        ['type' => 'light', 'scene' => 'home/aulitoff', 'label' => 'Eteindre ☽'],
         ['type' => 'light', 'scene' => 'chambre/bed', 'label' => 'Au lit'],
         ['type' => 'light', 'scene' => 'chambre/sleep', 'label' => 'Nuit'],
         ['type' => 'light', 'scene' => 'chambre/moon', 'label' => 'Clair de lune'],

diff --git a/scripts/lib/scenes.php b/scripts/lib/scenes.php
index 2a046d15d01a9912a3bde004575206433b5fee60..db58dd3d88eca6f3cb0fca1a51f5d7d7300cc816 100644 (file)
--- a/scripts/lib/scenes.php
+++ b/scripts/lib/scenes.php
@@ -57,16 +57,19 @@ $scenes = [
         ['type' => 'function', 'function' => 'chambreAuto', 'args' => [true]],
     ],
     'chambre/bed' => [
+        ['type' => 'scene', 'scene' => 'chambre/bedbase'],
+        ['type' => 'scene', 'scene' => 'chambre/nightlights'],
+        ['type' => 'scene', 'scene' => 'sdb/nuit'],
+        ['type' => 'scene', 'scene' => 'chambre/cheminee'],
+    ],
+    'chambre/bedbase' => [
         ['type' => 'function', 'function' => 'chambreAuto', 'args' => [false]],
         ['type' => 'nightmode', 'mode' => '1'],
         ['type' => 'ecomode', 'mode' => '1'],
         ['type' => 'state', 'key' => 'chambre', 'value' => 0],
         ['type' => 'scene', 'scene' => 'chambre/rideaux/close'],
         ['type' => 'insteon', 'command' => '0?1131=I=0=0'],
-        ['type' => 'scene', 'scene' => 'chambre/nightlights'],
-        ['type' => 'scene', 'scene' => 'sdb/nuit'],
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [$bedlowscreenbrightness]],
-        ['type' => 'scene', 'scene' => 'chambre/cheminee'],
         ['type' => 'scene', 'scene' => 'chambre/planetarium/on'], // Planétarium on
         ['type' => 'scene', 'scene' => 'chambre/deshumidificateur/off'],
         ['type' => 'scene', 'scene' => 'chambre/raspberry/off'],
@@ -124,6 +127,11 @@ $scenes = [
         ['type' => 'function', 'function' => 'bedbrightness', 'args' => [255]],
         ['type' => 'scene', 'scene' => 'chambre/cheminee/cold'],
     ],
+    'chambre/sleepoff' => [
+        ['type' => 'scene', 'scene' => 'chambre/bedbase'],
+        ['type' => 'scene', 'scene' => 'sdb/off'],
+        ['type' => 'scene', 'scene' => 'sdb/off'],
+    ],
     'chambre/sleepbase' => [
         ['type' => 'nightmode', 'mode' => '1'],
         ['type' => 'ecomode', 'mode' => '1'],
@@ -297,9 +305,17 @@ $scenes = [
         ['type' => 'domoticz', 'device' => '392', 'command' => true, 'priority' => true],
     ],
     'home/aulit' => [
+        ['type' => 'scene', 'scene' => 'chambre/aulitbase'],
+        ['type' => 'scene', 'scene' => 'chambre/bed'],
+    ],
+    'home/aulitoff'=>[
+        ['type' => 'scene', 'scene' => 'chambre/aulitbase'],
+        ['type' => 'scene', 'scene' => 'chambre/off'],
+        ['type' => 'scene', 'scene' => 'sdb/off'],
+    ],
+    'home/aulitbase' => [
         ['type' => 'nightmode', 'mode' => '1'],
         ['type' => 'ecomode', 'mode' => '1'],
-        ['type' => 'scene', 'scene' => 'chambre/bed'],
         ['type' => 'scene', 'scene' => 'bureau/off'],
         ['type' => 'scene', 'scene' => 'salon/off'],
         ['type' => 'scene', 'scene' => 'cuisine/off'],
@@ -493,11 +509,11 @@ $scenes = [
         ['type' => 'scene', 'scene' => 'bureau/sleepPC'],
     ],
     'bureau/media/play' => [
-        ['type' => 'scene', 'scene' => 'bureau/screen/down'],
-        ['type' => 'scene', 'scene' => 'bureau/rideaux/close'],
-        ['type' => 'scene', 'scene' => 'bureau/off'],
-        ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]],
-        ['type' => 'ir', 'room' => 'bureau', 'device' => 'Projector', 'command' => 'PowerOn'],
+//        ['type' => 'scene', 'scene' => 'bureau/screen/down'],
+//        ['type' => 'scene', 'scene' => 'bureau/rideaux/close'],
+//        ['type' => 'scene', 'scene' => 'bureau/off'],
+//        ['type' => 'function', 'function' => 'bureauAuto', 'args' => [false]],
+//        ['type' => 'ir', 'room' => 'bureau', 'device' => 'Projector', 'command' => 'PowerOn'],
     ],
     'bureau/screen/down' => [
         ['type' => 'domoticz', 'device' => '1', 'command' => true, 'priority' => true],

diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php
index ca9275f5a27849ae0d6815f0ea36978e04a2e65e..bc16aac566dd191fd952013a7282f562bd09e45d 100644 (file)
--- a/scripts/lib/shield.php
+++ b/scripts/lib/shield.php
@@ -195,13 +195,20 @@ function shieldGetKeysToChannel($list, $channel, $perline = 4, $sendAfter = [])
     return $res;
 }
 
-function shieldVLC($file)
+function shieldKodi($file)
 {
     shieldHome();
     $url = 'smb://Share:dcfyjbcyckwydtgufjx@192.168.13.4/Share/' . $file;
     _adb('shell am start', '-a android.intent.action.VIEW  -d \'"' . $url . '"\' -n org.xbmc.kodi/.Splash');
 }
 
+function shieldVLC($file)
+{
+    shieldHome();
+    $url = 'smb://Share:dcfyjbcyckwydtgufjx@192.168.13.4/Share/' . $file;
+    _adb('shell am start', '-a android.intent.action.VIEW  -d \'"' . $url . '"\' -n org.videolan.vlc/.StartActivity');
+}
+
 function shieldListApps()
 {
     shieldConnect();

diff --git a/scripts/shield.php b/scripts/shield.php
index d92ec3a06f509d7fac12c873af8be16765eae5af..068cc3c5d571bae1b348a9df611019f6970b9979 100644 (file)
--- a/scripts/shield.php
+++ b/scripts/shield.php
@@ -21,5 +21,7 @@ if (isset($_GET['key'])) {
     shieldTv($_GET['replay'], 'replay');
 } else if (isset($_GET['vlc'])) {
     shieldVLC($_GET['vlc']);
+}else if (isset($_GET['kodi'])) {
+    shieldKodi($_GET['kodi']);
 }
 echo '</pre>';
\ No newline at end of file