diff --git a/app_dashboard/changelog.md b/app_dashboard/changelog.md index fbf39c7..b818168 100644 --- a/app_dashboard/changelog.md +++ b/app_dashboard/changelog.md @@ -9,6 +9,15 @@ author: 2. $ {VERSION_CODE} (去掉空格),会自动替换实际修订号,比如 1.1.4.$ {VERSION_CODE} --> +### [1.0.3.${VERSION_CODE}] - 2025.11.1 + +#### 文件下载 + +* [dashboardclient_1.0.3.apk](dashboardclient_1.0.3.apk) + +#### 更新记录 +* 当选择自动跳转时,直接访问 URL 前缀,这样网址自由设置 + ### [1.0.2.19] - 2025.10.11 #### 文件下载 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 ab6c168..bdf254a 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 @@ -96,21 +96,19 @@ public class BuildingDashboardActivity extends FullscreenActivity { protected void onResume() { super.onResume(); + // 当用户选择了自动跳转时,直接访问 urlPrefix,这样 url 可以自由设置 SharedPreferences pre = PreferenceManager.getDefaultSharedPreferences(this); - String url = pre.getString("k_url", "http://172.18.22.211:8002/Dashboard"); - String type = pre.getString("k_dashboard_type", "0"); - configUrl = url + "/data/config.json"; - - if(!type.equals("0")) - mainUrl = url + "/dashboards/" + type + "/index.html"; - else - mainUrl = url + "/index.html"; + 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; configLoadHandler.post(configLoadRunnable); loadUrlWithRetry(); } private void loadUrlWithRetry() { + Log.i("WebView", "Loading " + mainUrl); binding.webview.loadUrl(mainUrl); } 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 31bc5c0..74f79dc 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,7 @@ - - 0 (根据服务器配置跳转) - 1 (按楼层) - 2 (网格+统计) + + 自动跳转 + 按楼层 + 网格+统计 \ 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 d277614..e4a19fc 100644 --- a/app_dashboard/src/main/res/values/arrays.xml +++ b/app_dashboard/src/main/res/values/arrays.xml @@ -10,15 +10,15 @@ reply_all - - 0 (Auto Redirect) - 1 (Floor) - 2 (Grid+Statics) + + Auto Redirect + Floor + Grid+Statics - - 0 - 1 - 2 + + / + /dashboards/1 + /dashboards/2 \ No newline at end of file diff --git a/app_dashboard/src/main/res/values/strings.xml b/app_dashboard/src/main/res/values/strings.xml index f834dca..7e74272 100644 --- a/app_dashboard/src/main/res/values/strings.xml +++ b/app_dashboard/src/main/res/values/strings.xml @@ -2,5 +2,5 @@ Dashboard Building Dashboard Settings - 0 + / \ 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 295fa1e..e7062bf 100644 --- a/app_dashboard/src/main/res/xml/root_preferences.xml +++ b/app_dashboard/src/main/res/xml/root_preferences.xml @@ -1,16 +1,16 @@ + app:entries="@array/url_end_point_entries" + app:entryValues="@array/url_end_point_values" + app:defaultValue="@string/url_end_point_default_value" /> \ No newline at end of file