From 59c228f36ce23a3b6cacc632ffb0a0559e8caef2 Mon Sep 17 00:00:00 2001
From: jieyao <a2971306172@qq.com>
Date: Tue, 19 Nov 2024 14:52:11 +0800
Subject: [PATCH] =?UTF-8?q?1.19=20index.html=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  3 +-
 app/src/main/assets/demo/index.html           | 45 +++++++++++++------
 .../engine/impl/NetworkSettingEngine.java     |  1 +
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d492c58..20f1c26 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 28
         targetSdk 28
         versionCode 1
-        versionName "1.18"
+        versionName "1.19"
 
         // 1.0 IDATA广播模式处理
         // 1.1 霍尼韦尔的监听修改（扫描网站二维码跳出程序，监听失效，调整）、斑马PDA广播模式设置
@@ -32,6 +32,7 @@ android {
         // 1.16 idata pda 不设置模式
         // 1.17 霍尼韦尔EDA51、EDA50P，调用扫描枪的方法，在关闭的时候停止调用扫描枪
         // 1.18 瑞兴平板，读取扫描结果，使用同步加锁模式
+        // 1.19 index页面接入初始化数据
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'armeabi-v7a'
diff --git a/app/src/main/assets/demo/index.html b/app/src/main/assets/demo/index.html
index 3e9137e..fabf6aa 100644
--- a/app/src/main/assets/demo/index.html
+++ b/app/src/main/assets/demo/index.html
@@ -99,20 +99,6 @@
 
 
     </style>
-    <script>
-        function saveSetting(){
-           var data=JSON.stringify({
-          "address":document.getElementById('address').value,
-          "port":document.getElementById('port').value,
-          "path":document.getElementById('path').value,
-          "screen_rotation":document.getElementById('screen_rotation').value,
-          "hide_bar":document.getElementById('hide_bar').value
-         });
-         window.NetworkSettingEngine.saveSetting(data);
-         window.View.reload();
-        }
-
-    </script>
 
 </head>
 
@@ -148,4 +134,35 @@
     </div>
 </div>
 </body>
+<script>
+
+    function init() {
+        var dstr = window.NetworkSettingEngine.getStringSetting();
+        if (dstr.length > 0) {
+            var d = JSON.parse(dstr);
+            document.getElementById('address').value = d.address;
+            document.getElementById('port').value = d.port;
+            document.getElementById('path').value = d.path;
+            document.getElementById('screen_rotation').value = d.screen_rotation;
+            document.getElementById('hide_bar').value = d.hide_bar;
+            console.log("d_data_end_=========================");
+        }
+    }
+
+    init();
+
+    function saveSetting(){
+       var data=JSON.stringify({
+      "address":document.getElementById('address').value,
+      "port":document.getElementById('port').value,
+      "path":document.getElementById('path').value,
+      "screen_rotation":document.getElementById('screen_rotation').value,
+      "hide_bar":document.getElementById('hide_bar').value
+     });
+     window.NetworkSettingEngine.saveSetting(data);
+     window.View.reload();
+    }
+
+</script>
+
 </html>
diff --git a/app/src/main/java/chaoran/business/engine/impl/NetworkSettingEngine.java b/app/src/main/java/chaoran/business/engine/impl/NetworkSettingEngine.java
index fedbc17..c592bd9 100644
--- a/app/src/main/java/chaoran/business/engine/impl/NetworkSettingEngine.java
+++ b/app/src/main/java/chaoran/business/engine/impl/NetworkSettingEngine.java
@@ -45,6 +45,7 @@ public class NetworkSettingEngine implements SettingEngine {
         networkSetting.setPort(port);
         networkSetting.setPath(path);
         networkSetting.setScreen_rotation(screen_rotation);
+        networkSetting.setHide_bar(spf.getInt("hide_bar", 3));
         return networkSetting;
     }