From 2a5a6e95b490e2aa1e49c5eded90bdd5d0e25f5a Mon Sep 17 00:00:00 2001 From: Zhanghu Date: Thu, 12 Mar 2026 08:55:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BB=AA=E8=A1=A8=E7=9B=98?= =?UTF-8?q?=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/BuildingDashboardActivity.java | 8 +++----- app_dashboard/src/main/res/values-zh-rCN/arrays.xml | 6 +----- app_dashboard/src/main/res/values/arrays.xml | 12 ------------ app_dashboard/src/main/res/xml/root_preferences.xml | 7 ------- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/BuildingDashboardActivity.java b/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/BuildingDashboardActivity.java index 531107b..50eb46e 100644 --- a/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/BuildingDashboardActivity.java +++ b/app_dashboard/src/main/java/cn/ykbox/dashboard/activity/BuildingDashboardActivity.java @@ -103,12 +103,9 @@ public class BuildingDashboardActivity extends FullscreenActivity { protected void onResume() { super.onResume(); - // 当用户选择了自动跳转时,直接访问 urlPrefix,这样 url 可以自由设置 SharedPreferences pre = PreferenceManager.getDefaultSharedPreferences(this); - String urlPrefix = pre.getString("k_url_prefix", "http://172.18.22.211:8002/Dashboard"); - String urlEndPoint = pre.getString("k_url_end_point", "/").replaceFirst("^/", ""); - configUrl = urlPrefix + "/data/config.json"; - mainUrl = urlEndPoint.isEmpty() ? urlPrefix : urlPrefix + "/" + urlEndPoint; + mainUrl = pre.getString("k_url_prefix", "http://172.18.22.211:8002/Dashboard"); + configUrl = mainUrl + "/data/config.json"; Log.i(TAG, "Main: " + mainUrl); Log.i(TAG, "Config: " + configUrl); @@ -298,6 +295,7 @@ public class BuildingDashboardActivity extends FullscreenActivity { WebSettings webSettings = binding.webview.getSettings(); webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE); webSettings.setJavaScriptEnabled(true); + webSettings.setDomStorageEnabled(true); // 允许媒体自动播放 (Android 8+ 必须) webSettings.setMediaPlaybackRequiresUserGesture(false); diff --git a/app_dashboard/src/main/res/values-zh-rCN/arrays.xml b/app_dashboard/src/main/res/values-zh-rCN/arrays.xml index 74f79dc..6b30d8d 100644 --- a/app_dashboard/src/main/res/values-zh-rCN/arrays.xml +++ b/app_dashboard/src/main/res/values-zh-rCN/arrays.xml @@ -1,7 +1,3 @@ - - 自动跳转 - 按楼层 - 网格+统计 - + \ No newline at end of file diff --git a/app_dashboard/src/main/res/values/arrays.xml b/app_dashboard/src/main/res/values/arrays.xml index e4a19fc..6cf9ed4 100644 --- a/app_dashboard/src/main/res/values/arrays.xml +++ b/app_dashboard/src/main/res/values/arrays.xml @@ -9,16 +9,4 @@ reply reply_all - - - Auto Redirect - Floor - Grid+Statics - - - - / - /dashboards/1 - /dashboards/2 - \ No newline at end of file diff --git a/app_dashboard/src/main/res/xml/root_preferences.xml b/app_dashboard/src/main/res/xml/root_preferences.xml index ea45e01..bcf5bb5 100644 --- a/app_dashboard/src/main/res/xml/root_preferences.xml +++ b/app_dashboard/src/main/res/xml/root_preferences.xml @@ -5,13 +5,6 @@ app:title="URL 前缀" app:defaultValue="http://172.18.22.211:8002/Dashboard" app:useSimpleSummaryProvider="true" /> -