.

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2b0e91794f1bb671e256936c1ff4c50f7d8fd7a2..d544e231e36a82967dadfba005bd15dcc5b90ffa 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,12 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="352ce63a-b52a-41a2-979b-becda7920939" name="Default" comment=".">
-      <change afterPath="$PROJECT_DIR$/scripts/setstate.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.htaccess" beforeDir="false" afterPath="$PROJECT_DIR$/.htaccess" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/js/cordova.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/cordova.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/js/home.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/home.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/state.php" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/state.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" />
@@ -1009,14 +1006,7 @@
       <workItem from="1620387281761" duration="3893000" />
       <workItem from="1620391230238" duration="8835000" />
       <workItem from="1620565702683" duration="6590000" />
-      <workItem from="1621059599606" duration="1181000" />
-    </task>
-    <task id="LOCAL-00434" summary=".">
-      <created>1610702549931</created>
-      <option name="number" value="00434" />
-      <option name="presentableId" value="LOCAL-00434" />
-      <option name="project" value="LOCAL" />
-      <updated>1610702549932</updated>
+      <workItem from="1621059599606" duration="1470000" />
     </task>
     <task id="LOCAL-00435" summary=".">
       <created>1610959164385</created>
@@ -1354,7 +1344,14 @@
       <option name="project" value="LOCAL" />
       <updated>1620572516163</updated>
     </task>
-    <option name="localTasksCounter" value="483" />
+    <task id="LOCAL-00483" summary=".">
+      <created>1621060853769</created>
+      <option name="number" value="00483" />
+      <option name="presentableId" value="LOCAL-00483" />
+      <option name="project" value="LOCAL" />
+      <updated>1621060853769</updated>
+    </task>
+    <option name="localTasksCounter" value="484" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

diff --git a/js/home.js b/js/home.js
index 709ff2cb4ed42820bf9f86667d5e6657e47a8a5b..0525f0ae3ec39a08bac9101998cf8809a71e2e6d 100644 (file)
--- a/js/home.js
+++ b/js/home.js
@@ -57,10 +57,12 @@ $(function () {
         runSSHQueue();
     }, 1500);
 
-    setInterval(function () {
+    if (androidApp) {
+        setInterval(function () {
+            checkPower();
+        }, 60000);
         checkPower();
-    }, 60000);
-    checkPower();
+    }
 
     console.log('menu init');
     menu = new MmenuLight(
@@ -647,7 +649,7 @@ function showScreenSaver() {
     if ($('main section:visible').data('section') === 'remote') {
         return;
     }
-    if(androidApp && !power){
+    if (androidApp && !power) {
         return;
     }
 

diff --git a/scripts/lib/shield.php b/scripts/lib/shield.php
index 2e973e6a8dd3cd19e03e60a7688c97db87358442..94aeb3c89f0f01e9e15cea9f0424e754a42fa6f3 100644 (file)
--- a/scripts/lib/shield.php
+++ b/scripts/lib/shield.php
@@ -121,7 +121,7 @@ function shieldKey($keys, $device = null)
 
 function shieldNetflix($id = null, $device = null)
 {
-    shieldRunActivity($device);
+    shieldRunActivity($device, true);
     shieldHome($device);
     sleep(1);