.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b70ffe44d281af27b476cbe4c3f1ded19d367059..d2b6a665fd4b013b2d25a6891a423110dbd303f7 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
+      <change afterPath="$PROJECT_DIR$/images/switch.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/scripts/switch.php" 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/denon.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/denon.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$/servers/logcat.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcat.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/media.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/media.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/pcgames.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/pcgames.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -238,7 +239,7 @@
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1553247665857" />
     <property name="dumpAutoload T:/Drive/Works/home/composer.json" value="--no-interaction --ansi --verbose --optimize" />
     <property name="editor.config.ad.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../home-android" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/images" />
     <property name="list.type.of.created.stylesheet" value="Less" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="project.structure.last.edited" value="Problems" />
@@ -248,18 +249,18 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="T:\Drive\Works\home\images" />
       <recent name="T:\Drive\Works\home\style\fonts\fontawesome" />
       <recent name="T:\Drive\Works\home" />
       <recent name="T:\Drive\Works\home\servers" />
       <recent name="T:\Drive\Works\home\config" />
-      <recent name="T:\Drive\Works\home\images\backgrounds" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="T:\Drive\Works\home\images" />
       <recent name="T:\Drive\Works\home\images\rooms" />
       <recent name="T:\Drive\Works\home\js\mmenu" />
       <recent name="T:\Drive\Works\home\tools\xplanet" />
       <recent name="T:\Drive\Works\home\style\fonts\webfonts" />
-      <recent name="T:\Drive\Works\home\style\fonts\webfonts\520" />
     </key>
   </component>
   <component name="RunManager">
@@ -275,6 +276,17 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="ArquillianTestNG" factoryName="">
       <option name="arquillianRunConfiguration">
         <value>
@@ -967,14 +979,7 @@
       <workItem from="1613594262179" duration="860000" />
       <workItem from="1613737644524" duration="2679000" />
       <workItem from="1613767930279" duration="780000" />
-      <workItem from="1613993901536" duration="29821000" />
-    </task>
-    <task id="LOCAL-00405" summary=".">
-      <created>1605696730817</created>
-      <option name="number" value="00405" />
-      <option name="presentableId" value="LOCAL-00405" />
-      <option name="project" value="LOCAL" />
-      <updated>1605696730817</updated>
+      <workItem from="1613993901536" duration="33445000" />
     </task>
     <task id="LOCAL-00406" summary=".">
       <created>1605973216961</created>
@@ -1312,7 +1317,14 @@
       <option name="project" value="LOCAL" />
       <updated>1613816554457</updated>
     </task>
-    <option name="localTasksCounter" value="454" />
+    <task id="LOCAL-00454" summary=".">
+      <created>1614370268863</created>
+      <option name="number" value="00454" />
+      <option name="presentableId" value="LOCAL-00454" />
+      <option name="project" value="LOCAL" />
+      <updated>1614370268864</updated>
+    </task>
+    <option name="localTasksCounter" value="455" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/config/media.php b/config/media.php
index 8013755987f7068b78461ce4bef3f7011a8acb08..58067b4573fa3bd5ae2afd35b9d90ad9242f8997 100644 (file)
--- a/config/media.php
+++ b/config/media.php
@@ -7,13 +7,13 @@ $device = config('DEVICE');
 $shortcuts['media'] = [['label' => 'TV', 'type' => 'sub', 'sub' => 'tv'], ['label' => 'Ajoutés récemment', 'type' => 'sub', 'sub' => 'mediarecent']];
 $shortcuts['media'][] = ['label' => 'Séries TV', 'type' => 'sub', 'sub' => 'seriestv'];
 $shortcuts['media'][] = ['label' => 'Films', 'type' => 'sub', 'sub' => 'movies'];
-if ($device == 'salon') {
+if ($device == 'salon' || $device == 'bureau' || $device == 'bureausun') {
     $shortcuts['media'][] = array('type' => 'netflix', 'url' => 'scripts/netflix.php?id=home', 'label' => '<img src="images/netflix.png">');
-}
-if ($device == 'salon' || $device == 'bureau') {
-    $shortcuts['media'][] = ['label' => 'Jeux Videos', 'type' => 'ajax', 'url' => '/scripts/pcgames.php'];
     $shortcuts['media'][] = ['label' => 'Vidéo web', 'type' => 'raspberrycast'];
 }
+if ($device == 'bureau' || $device == 'bureausun') {
+    $shortcuts['media'][] = ['label' => '<img style="width: 100%;transform: scale(1.1);" src="images/switch.png">', 'type' => 'ajax', 'url' => '/scripts/switch.php'];
+}
 
 
 $tvshows = getTVShows();

diff --git a/images/switch.png b/images/switch.png
new file mode 100644 (file)
index 0000000..91e60ce
Binary files /dev/null and b/images/switch.png differ

diff --git a/scripts/pcgames.php b/scripts/pcgames.php
index 60673f9312c8cd65c590fbccf1af859c65730680..f65781f5862ff4d9587f27f1ec66b2a8f58ea910 100644 (file)
--- a/scripts/pcgames.php
+++ b/scripts/pcgames.php
@@ -3,8 +3,4 @@ require_once "import.php";
 
 if (config('DEVICE') == 'bureau') {
     harmonyActivity('tv');
-}
-
-sshCommand('killall fbi', null, false, true);
-sshCommand('killall /usr/bin/remmina', null, false, true);
-sshCommand('DISPLAY=:0 /usr/bin/remmina -c /home/pi/.local/share/remmina/1571565005433.remmina', null, false, false);
\ No newline at end of file
+}
\ No newline at end of file

diff --git a/scripts/switch.php b/scripts/switch.php
new file mode 100644 (file)
index 0000000..850ad74
--- /dev/null
+++ b/scripts/switch.php
@@ -0,0 +1,7 @@
+<?php
+require_once "import.php";
+$device = config('DEVICE');
+if ($device == 'bureau' || $device === 'bureausun') {
+    execScene('bureau/media/play');
+    harmonyActivity('switch');
+}
\ No newline at end of file