.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1e50fc4758e0b67faab4e8373696e34552bc1ab8..5705bf080cfa807080fad92416aa1639af891525 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment="." />
+    <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$/scripts/lib/shield.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/shield.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/servers/logcat.php" beforeDir="false" afterPath="$PROJECT_DIR$/servers/logcat.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -895,14 +899,7 @@
       <workItem from="1605087787424" duration="33487000" />
       <workItem from="1605261347643" duration="1199000" />
       <workItem from="1605342171398" duration="4613000" />
-      <workItem from="1605355486465" duration="9252000" />
-    </task>
-    <task id="LOCAL-00343" summary=".">
-      <created>1599462252287</created>
-      <option name="number" value="00343" />
-      <option name="presentableId" value="LOCAL-00343" />
-      <option name="project" value="LOCAL" />
-      <updated>1599462252288</updated>
+      <workItem from="1605355486465" duration="12745000" />
     </task>
     <task id="LOCAL-00344" summary=".">
       <created>1602145314496</created>
@@ -1240,7 +1237,14 @@
       <option name="project" value="LOCAL" />
       <updated>1605364934828</updated>
     </task>
-    <option name="localTasksCounter" value="392" />
+    <task id="LOCAL-00392" summary=".">
+      <created>1605365556377</created>
+      <option name="number" value="00392" />
+      <option name="presentableId" value="LOCAL-00392" />
+      <option name="project" value="LOCAL" />
+      <updated>1605365556377</updated>
+    </task>
+    <option name="localTasksCounter" value="393" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -1286,12 +1290,12 @@
       <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="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605364931649">
+    <state x="198" y="0" width="737" height="502" key="CommitChangelistDialog2" timestamp="1605365550578">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="132" y="0" width="737" height="502" key="CommitChangelistDialog2/0.0.1707.920@0.0.1707.920" timestamp="1605086955514" />
     <state x="701" y="75" key="CommitChangelistDialog2/0.0.1920.1160@0.0.1920.1160" timestamp="1605188136787" />
-    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605364931649" />
+    <state x="198" y="0" width="745" height="567" key="CommitChangelistDialog2/0.0.2560.1040@0.0.2560.1040" timestamp="1605365550578" />
     <state x="952" y="244" key="FileChooserDialogImpl" timestamp="1605104496549">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
@@ -1315,11 +1319,11 @@
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="295" y="0" width="1290" height="907" key="dock-window-1/0.0.2560.1040@0.0.2560.1040" timestamp="1603274697406" />
-    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1605123919400">
+    <state x="977" y="257" width="607" height="536" key="find.popup" timestamp="1605365749518">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>
     <state x="651" y="227" width="550" height="534" key="find.popup/0.0.1707.920@0.0.1707.920" timestamp="1604301949692" />
-    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1605123919400" />
+    <state x="977" y="257" width="607" height="536" key="find.popup/0.0.2560.1040@0.0.2560.1040" timestamp="1605365749518" />
     <state x="1056" y="292" key="refactoring.ChangeSignatureDialog" timestamp="1604518096294">
       <screen x="0" y="0" width="2560" height="1040" />
     </state>

diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php
index c56d43665efdcdc91313649106d0d667aee6ed46..f8496b28506ac1a895c56d620414c68b5a2780a9 100644 (file)
--- a/scripts/lib/shield.php
+++ b/scripts/lib/shield.php
@@ -244,6 +244,7 @@ function shieldGetApps()
 
 function shieldHome($device = null)
 {
+    shieldWakeup($device);
     shieldKey('home', $device);
     usleep(0.5 * 1000000);
 }

diff --git a/servers/logcat.php b/servers/logcat.php
index 61ab15d225ebfec392e9aab1af578df0d6dbbbc8..5671808091b0d4f63a899b8449edbda2f490fa42 100644 (file)
--- a/servers/logcat.php
+++ b/servers/logcat.php
@@ -18,6 +18,18 @@ $cases = [
         echo 'wakeup' . "\n";
         shieldRunActivity($device);
     },
+    'WindowManager: handleComboKeys keyCode: 25, keyAction: 1' => function () use ($device) {
+        if ($device === 'salon') {
+            echo 'volume-down' . "\n";
+            harmonyRequest('commands/volume-down?repeat=5', 'POST');
+        }
+    },
+    'WindowManager: handleComboKeys keyCode: 24, keyAction: 1' => function () use ($device) {
+        if ($device === 'salon') {
+            echo 'volume-up' . "\n";
+            harmonyRequest('commands/volume-up?repeat=4', 'POST');
+        }
+    }
 ];
 
 echo 'Run home server logcat ' . $device . "\n";