From e24a8955a2bbe77456eaa570893a4208a13a1bc7 Mon Sep 17 00:00:00 2001 From: jieyao Date: Sun, 4 Aug 2024 18:03:08 +0800 Subject: [PATCH] =?UTF-8?q?1.15=20=E7=B3=BB=E7=BB=9F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=A0=8F=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= 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 | 7 +++++- .../business/activity/MainActivity.java | 9 ++++++-- .../activity/NetworkSettingActivity.java | 5 ++++- .../engine/entity/NetworkSetting.java | 10 +++++++++ .../engine/impl/NetworkSettingEngine.java | 2 ++ .../res/layout/activity_setting_network.xml | 22 +++++++++++++++++++ 7 files changed, 53 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cd5b862..8aefa4f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { minSdk 28 targetSdk 28 versionCode 1 - versionName "1.14" + versionName "1.15" // 1.0 IDATA广播模式处理 // 1.1 霍尼韦尔的监听修改（扫描网站二维码跳出程序，监听失效，调整）、斑马PDA广播模式设置 @@ -28,6 +28,7 @@ android { // 1.12 屏幕旋转，采取配置化模式（只能竖屏、横屏）；取消旋转屏幕就重置activity生命周期 // 1.13 新大陆pda 兼容广播模式；NLS-NFT10 // 1.14 瑞芯 rk3566_r 添加引用 librockchip.so； 新加一个方法，返回当前PDA的厂家和型号 + // 1.15 系统状态栏根据配置进行设置 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 9f7980a..3e9137e 100644 --- a/app/src/main/assets/demo/index.html +++ b/app/src/main/assets/demo/index.html @@ -105,7 +105,8 @@ "address":document.getElementById('address').value, "port":document.getElementById('port').value, "path":document.getElementById('path').value, - "screen_rotation":document.getElementById('screen_rotation').value + "screen_rotation":document.getElementById('screen_rotation').value, + "hide_bar":document.getElementById('hide_bar').value }); window.NetworkSettingEngine.saveSetting(data); window.View.reload(); @@ -135,6 +136,10 @@ +
+ + +
diff --git a/app/src/main/java/chaoran/business/activity/MainActivity.java b/app/src/main/java/chaoran/business/activity/MainActivity.java index 78fad69..15fe5a4 100644 --- a/app/src/main/java/chaoran/business/activity/MainActivity.java +++ b/app/src/main/java/chaoran/business/activity/MainActivity.java @@ -58,6 +58,7 @@ import chaoran.business.utils.StatusBarUtil; public class MainActivity extends AppCompatActivity implements ResultListener{ public static int SCREEN_ROTATION = 3; // 屏幕旋转的设置 + public static int hideBar = 0; // 屏幕旋转的设置 MyOrientationDetector myOrientationDetector; @@ -154,8 +155,7 @@ public class MainActivity extends AppCompatActivity implements ResultListener{ WebSettings settings = webView.getSettings(); settings.setJavaScriptEnabled(true); -// StatusBarUtil.transparencyBar( this); // 设置全部透明，需要在页面设置一个参数进行布局的样式跳转，不同的手机端，状态栏高度不一样（apk设置状态栏高度无效，这个是安卓9的一个bug），所以在此采取隐藏状态栏 - StatusBarUtil.hideStatusBar( this); // 设置全部透明 + //设置接口进行windows暴露 settings.setDomStorageEnabled(true); @@ -167,6 +167,10 @@ public class MainActivity extends AppCompatActivity implements ResultListener{ webView.addJavascriptInterface(this, "View"); webView.addJavascriptInterface(new LocalAddressUtil(this, this, webView), "Localpda"); webView.loadUrl(url()); +// StatusBarUtil.transparencyBar( this); // 设置全部透明，需要在页面设置一个参数进行布局的样式跳转，不同的手机端，状态栏高度不一样（apk设置状态栏高度无效，这个是安卓9的一个bug），所以在此采取隐藏状态栏 + if (hideBar == 1) { + StatusBarUtil.hideStatusBar( this); // 设置全部透明 + } } //配置客户端 @@ -308,6 +312,7 @@ public class MainActivity extends AppCompatActivity implements ResultListener{ String path = spf.getString("path", "").replaceAll(" ", ""); String link = address.concat(":").concat(String.valueOf(port)).concat(path); SCREEN_ROTATION = spf.getInt("screen_rotation", 3); + hideBar = spf.getInt("hide_bar", 3); return link.startsWith("http://") ? link : "http://".concat(link); } diff --git a/app/src/main/java/chaoran/business/activity/NetworkSettingActivity.java b/app/src/main/java/chaoran/business/activity/NetworkSettingActivity.java index 17b1820..8b1227c 100644 --- a/app/src/main/java/chaoran/business/activity/NetworkSettingActivity.java +++ b/app/src/main/java/chaoran/business/activity/NetworkSettingActivity.java @@ -19,7 +19,7 @@ import chaoran.business.R; public class NetworkSettingActivity extends AppCompatActivity { - private EditText address, path, port, screen_rotation; + private EditText address, path, port, screen_rotation, hide_bar; private Button save, cancel; @Override @@ -36,6 +36,7 @@ public class NetworkSettingActivity extends AppCompatActivity { path = findViewById(R.id.path); port = findViewById(R.id.port); screen_rotation = findViewById(R.id.screen_rotation); + hide_bar = findViewById(R.id.hide_bar); save = findViewById(R.id.save); cancel = findViewById(R.id.cancel); SharedPreferences sharedPreferences = this.getSharedPreferences("crtech", Context.MODE_PRIVATE); @@ -43,6 +44,7 @@ public class NetworkSettingActivity extends AppCompatActivity { path.setText(sharedPreferences.getString("path", "")); port.setText(String.valueOf(sharedPreferences.getInt("port", -1))); screen_rotation.setText(String.valueOf(sharedPreferences.getInt("screen_rotation", 3))); + hide_bar.setText(String.valueOf(sharedPreferences.getInt("hide_bar", 0))); cancel.setOnClickListener((e) -> this.finish()); save.setOnClickListener((e) -> saveSetting()); } @@ -53,6 +55,7 @@ public class NetworkSettingActivity extends AppCompatActivity { editor.putString("path", path.getText().toString().trim()); editor.putInt("port", Integer.parseInt(port.getText().toString().trim())); editor.putInt("screen_rotation", Integer.parseInt(screen_rotation.getText().toString().trim())); + editor.putInt("hide_bar", Integer.parseInt(hide_bar.getText().toString().trim())); editor.commit(); this.finish(); } diff --git a/app/src/main/java/chaoran/business/engine/entity/NetworkSetting.java b/app/src/main/java/chaoran/business/engine/entity/NetworkSetting.java index d3700ff..47bc02f 100644 --- a/app/src/main/java/chaoran/business/engine/entity/NetworkSetting.java +++ b/app/src/main/java/chaoran/business/engine/entity/NetworkSetting.java @@ -14,6 +14,8 @@ public class NetworkSetting extends Setting { private Integer screen_rotation; + private Integer hide_bar; + public String getAddress() { return address; } @@ -45,4 +47,12 @@ public class NetworkSetting extends Setting { public void setScreen_rotation(Integer screen_rotation) { this.screen_rotation = screen_rotation; } + + public Integer getHide_bar() { + return hide_bar; + } + + public void setHide_bar(Integer hide_bar) { + this.hide_bar = hide_bar; + } } \ No newline at end of file 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 4c3f749..fedbc17 100644 --- a/app/src/main/java/chaoran/business/engine/impl/NetworkSettingEngine.java +++ b/app/src/main/java/chaoran/business/engine/impl/NetworkSettingEngine.java @@ -56,8 +56,10 @@ public class NetworkSettingEngine implements SettingEngine { editor.putString("path", networkSetting.getPath()); editor.putInt("port", networkSetting.getPort()); editor.putInt("screen_rotation", networkSetting.getScreen_rotation()); + editor.putInt("hide_bar", networkSetting.getHide_bar()); editor.commit(); MainActivity.SCREEN_ROTATION = networkSetting.getScreen_rotation(); + MainActivity.hideBar = networkSetting.getHide_bar(); return true; } diff --git a/app/src/main/res/layout/activity_setting_network.xml b/app/src/main/res/layout/activity_setting_network.xml index 59767b3..d2ef7e8 100644 --- a/app/src/main/res/layout/activity_setting_network.xml +++ b/app/src/main/res/layout/activity_setting_network.xml @@ -7,6 +7,28 @@ android:id="@+id/table"> + + + + + + + + + + +