From 55cd99687b4dddf353195055c565d6d4d6e6e164 Mon Sep 17 00:00:00 2001
From: jieyao <a2971306172@qq.com>
Date: Thu, 9 Oct 2025 11:11:05 +0800
Subject: [PATCH] =?UTF-8?q?2.11=20=E4=BC=98=E5=8C=96=E4=BA=86=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=85=8D=E7=BD=AE=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD=E9=A1=B5=E9=9D=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E5=8E=BB=E8=AE=BE=E7=BD=AE=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E5=B1=8F=E5=B9=95=E6=96=B9=E5=90=91=EF=BC=8C=E5=B7=B2?=
 =?UTF-8?q?=E7=BB=8Finit.json=E4=B8=AD=E6=B7=BB=E5=8A=A0=E4=BA=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=A4=87=E6=B3=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                    |  3 ++-
 app/src/main/assets/init.json                       |  9 +++++++++
 .../chaoran/business/activity/MainActivity.java     | 13 +++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/assets/init.json

diff --git a/app/build.gradle b/app/build.gradle
index 3122434..4f1beb8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdk 28
         targetSdk 28
         versionCode 1
-        versionName "2.10"
+        versionName "2.11"
 
         // 1.0 IDATA广播模式处理
         // 1.1 霍尼韦尔的监听修改（扫描网站二维码跳出程序，监听失效，调整）、斑马PDA广播模式设置
@@ -45,6 +45,7 @@ android {
         // 2.8 编写一个通用的广播模式，action：chaoran.crtech.cn.pda.scan    key：barcode
         // 2.9 初始化屏幕方向
         // 2.10 再次添加了init.json文件，进行初始化ip等参数
+        // 2.11 优化了保存配置的时候，重新加载页面方法，去设置初始化屏幕方向，已经init.json中添加了字段备注信息
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters 'armeabi-v7a'
diff --git a/app/src/main/assets/init.json b/app/src/main/assets/init.json
new file mode 100644
index 0000000..eda6bda
--- /dev/null
+++ b/app/src/main/assets/init.json
@@ -0,0 +1,9 @@
+{
+  "备注": "下面所有的字段，删除前面的_就是配置的字段，在没有手动配置的情况下，会读取字段中的信息，从而实现默认配置",
+  "_ip":"ip地址",
+  "_port":"端口号",
+  "_path":"访问路径",
+  "_screen_rotation":"屏幕旋转：1竖、2横、3横竖、4禁止",
+  "_hide_bar":"状态拦：1隐藏、2显示",
+  "_start_direction":"默认屏幕方向：1正竖、2倒竖、3正横、4倒横"
+}
\ No newline at end of file
diff --git a/app/src/main/java/chaoran/business/activity/MainActivity.java b/app/src/main/java/chaoran/business/activity/MainActivity.java
index 01511ce..294f9f1 100644
--- a/app/src/main/java/chaoran/business/activity/MainActivity.java
+++ b/app/src/main/java/chaoran/business/activity/MainActivity.java
@@ -407,6 +407,7 @@ public class MainActivity extends AppCompatActivity implements ResultListener{
                 }
             }catch (Exception e) {
                 Log.e("MainActivity", "get init file error");
+                return "file:///android_asset/demo/index.html";
             }
             if (map == null) {
                 return "file:///android_asset/demo/index.html";
@@ -423,6 +424,18 @@ public class MainActivity extends AppCompatActivity implements ResultListener{
 
     @JavascriptInterface
     public void reload() {
+        // 第一次设置，点击保存，初始化屏幕方向问题
+        int rotate = 1;
+        if (startDirection == 1) {
+            rotate = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT; // 正竖屏
+        }else if (startDirection == 2) {
+            rotate = ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT; // 倒竖屏
+        }else if (startDirection == 3) {
+            rotate = ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE; // 正横屏
+        }else if (startDirection == 4) {
+            rotate = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE; // 倒横屏
+        }
+        this.setRequestedOrientation(rotate);
         runOnUiThread(() -> {
             webView.loadUrl(url());
         });