From 028dfdff3d5d735ef98772dc63492cfac4be4926 Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 17 Feb 2024 23:41:15 +0800 Subject: [PATCH 1/2] [leanback] support config name --- .../android/tv/ui/dialog/ConfigDialog.java | 5 ++- app/src/leanback/res/layout/dialog_config.xml | 6 +++ app/src/main/assets/index.html | 39 ++++++++++++++----- app/src/main/assets/js/script.js | 2 +- .../fongmi/android/tv/event/ServerEvent.java | 14 +++++++ .../android/tv/server/process/Action.java | 3 +- 6 files changed, 56 insertions(+), 13 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java index 7d68bb9a0..4c815c06b 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/ConfigDialog.java @@ -139,10 +139,12 @@ public class ConfigDialog implements DialogInterface.OnDismissListener { } private void onPositive(View view) { + String name = binding.name.getText().toString().trim(); String text = binding.text.getText().toString().trim(); if (edit) Config.find(url, type).url(text).update(); if (text.isEmpty()) Config.delete(url, type); - callback.setConfig(Config.find(text, type)); + if (name.isEmpty()) callback.setConfig(Config.find(text, type)); + else callback.setConfig(Config.find(text, name, type)); dialog.dismiss(); } @@ -153,6 +155,7 @@ public class ConfigDialog implements DialogInterface.OnDismissListener { @Subscribe(threadMode = ThreadMode.MAIN) public void onServerEvent(ServerEvent event) { if (event.getType() != ServerEvent.Type.SETTING) return; + binding.name.setText(event.getName()); binding.text.setText(event.getText()); binding.text.setSelection(binding.text.getText().length()); } diff --git a/app/src/leanback/res/layout/dialog_config.xml b/app/src/leanback/res/layout/dialog_config.xml index 24b89132d..343a9f426 100644 --- a/app/src/leanback/res/layout/dialog_config.xml +++ b/app/src/leanback/res/layout/dialog_config.xml @@ -27,6 +27,12 @@ android:textSize="18sp" tools:text="@string/push_info" /> + +
-
+
+ +
@@ -47,10 +49,12 @@
-
+
+ +
@@ -60,16 +64,19 @@

接口/Proxy/User-Agent

-
+
- - + +
+
+ +
@@ -81,7 +88,7 @@
-
+
上傳檔案  新增資料夾  @@ -94,25 +101,37 @@
diff --git a/app/src/main/assets/js/script.js b/app/src/main/assets/js/script.js index 08a7e7761..b790410cd 100644 --- a/app/src/main/assets/js/script.js +++ b/app/src/main/assets/js/script.js @@ -13,7 +13,7 @@ function push() { } function setting() { - doAction('setting', { text: $('#setting_text').val() }); + doAction('setting', { text: $('#setting_text').val(), name: $('#setting_name').val() }); } function file(path) { diff --git a/app/src/main/java/com/fongmi/android/tv/event/ServerEvent.java b/app/src/main/java/com/fongmi/android/tv/event/ServerEvent.java index 28c889398..3eed9722e 100644 --- a/app/src/main/java/com/fongmi/android/tv/event/ServerEvent.java +++ b/app/src/main/java/com/fongmi/android/tv/event/ServerEvent.java @@ -6,6 +6,7 @@ public class ServerEvent { private final Type type; private final String text; + private final String name; public static void search(String text) { EventBus.getDefault().post(new ServerEvent(Type.SEARCH, text)); @@ -19,9 +20,18 @@ public class ServerEvent { EventBus.getDefault().post(new ServerEvent(Type.SETTING, text)); } + public static void setting(String text, String name) { + EventBus.getDefault().post(new ServerEvent(Type.SETTING, text, name)); + } + private ServerEvent(Type type, String text) { + this(type, text, ""); + } + + private ServerEvent(Type type, String text, String name) { this.type = type; this.text = text; + this.name = name; } public Type getType() { @@ -32,6 +42,10 @@ public class ServerEvent { return text; } + public String getName() { + return name; + } + public enum Type { SEARCH, PUSH, SETTING } diff --git a/app/src/main/java/com/fongmi/android/tv/server/process/Action.java b/app/src/main/java/com/fongmi/android/tv/server/process/Action.java index 11de23b23..2c0a52923 100644 --- a/app/src/main/java/com/fongmi/android/tv/server/process/Action.java +++ b/app/src/main/java/com/fongmi/android/tv/server/process/Action.java @@ -77,8 +77,9 @@ public class Action implements Process { private void onSetting(Map params) { String text = params.get("text"); + String name = params.get("name"); if (TextUtils.isEmpty(text)) return; - ServerEvent.setting(text); + ServerEvent.setting(text, name); } private void onFile(Map params) { From 0c78a46066426c19e5bf5b61c3f367d5f8fc4bca Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 18 Feb 2024 02:27:58 +0800 Subject: [PATCH 2/2] Remove border --- app/src/main/assets/css/style.css | 10 ++++------ app/src/main/assets/index.html | 8 ++++---- app/src/main/assets/js/script.js | 6 +++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/src/main/assets/css/style.css b/app/src/main/assets/css/style.css index 5d20405ab..6603395a3 100644 --- a/app/src/main/assets/css/style.css +++ b/app/src/main/assets/css/style.css @@ -1156,8 +1156,6 @@ input.weui-btn_mini { .weui-cells:before { top: 0; - border-top: 1px solid rgba(0, 0, 0, 0.1); - border-top: 1px solid var(--weui-FG-3); -webkit-transform-origin: 0 0; transform-origin: 0 0; -webkit-transform: scaleY(0.5); @@ -1178,8 +1176,6 @@ input.weui-btn_mini { .weui-cells:after { bottom: 0; - border-bottom: 1px solid rgba(0, 0, 0, 0.1); - border-bottom: 1px solid var(--weui-FG-3); -webkit-transform-origin: 0 100%; transform-origin: 0 100%; -webkit-transform: scaleY(0.5); @@ -1243,8 +1239,6 @@ input.weui-btn_mini { top: 0; right: 0; height: 1px; - border-top: 1px solid rgba(0, 0, 0, 0.1); - border-top: 1px solid var(--weui-FG-3); color: rgba(0, 0, 0, 0.1); color: var(--weui-FG-3); -webkit-transform-origin: 0 0; @@ -3296,9 +3290,11 @@ page { .weui-tabbar__item.weui-bar__item_on .weui-tabbar__label { color: #07c160; color: var(--weui-BRAND); + svg { fill: #07c160; } + svg { fill: var(--weui-BRAND); } @@ -3307,9 +3303,11 @@ page { .weui-tabbar__icon { display: inline-block; margin-bottom: 6px; + svg { fill: rgba(0, 0, 0, 0.9); } + svg { fill: var(--weui-FG-0); } diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html index 0e914aa0c..d685a1d7e 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/index.html @@ -31,7 +31,7 @@
-
+
@@ -52,7 +52,7 @@
-
+
@@ -74,7 +74,7 @@ -
+
@@ -87,7 +87,7 @@

本地

-
+
上傳檔案  新增資料夾  diff --git a/app/src/main/assets/js/script.js b/app/src/main/assets/js/script.js index b790410cd..ef1588471 100644 --- a/app/src/main/assets/js/script.js +++ b/app/src/main/assets/js/script.js @@ -29,7 +29,7 @@ function doAction(action, kv) { } function tpl_top(path) { - return ` + return `
.. @@ -40,7 +40,7 @@ function tpl_top(path) { } function tpl_dir(name, time, path) { - return ` + return `
` + name + ` @@ -52,7 +52,7 @@ function tpl_dir(name, time, path) { } function tpl_file(name, time, path, canDel) { - return ` + return `
` + name + `