add: 所有展示页面支持自定义标题名

add: 新增展示赞赏页3 add: 展示页2新增顶部图片开关控制
carolcoral · May 31, 2024 · 8a5cd22 · 8a5cd22
1 parent 75900ce
commit 8a5cd22
Show file tree

Hide file tree

Showing 9 changed files with 3,014 additions and 19 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=1.4.1
+version=1.5.0
diff --git a/src/main/java/site/xindu/afdian/config/ThemeSettingConfig.java b/src/main/java/site/xindu/afdian/config/ThemeSettingConfig.java
@@ -27,4 +27,9 @@ public class ThemeSettingConfig {
      * 顶部图片文字
      */
     private String rewardTopTitle = "";
+
+    /**
+     * 启用顶部头像滚动
+     */
+    private Boolean enableRewardRoll = false;
 }
diff --git a/src/main/java/site/xindu/afdian/service/AfdianRouter.java b/src/main/java/site/xindu/afdian/service/AfdianRouter.java
@@ -59,6 +59,10 @@ private void defaultModel(HashMap<String, Object> model) {
                 setting.get("sponsorNumber").asDouble()
             ).defaultIfEmpty(66.00);
         model.put("sponsorNumber", sponsorNumber);
+        Mono<String> rewardTopTitle = this.settingFetcher.get(THEME_SETTING).map(setting ->
+            setting.get("rewardTopTitle").asText()
+        ).defaultIfEmpty("感谢我的赞赏者们");
+        model.put("rewardTopTitle", rewardTopTitle);
     }
 
     private void extracted(HashMap<String, Object> model, String theme) {
@@ -71,10 +75,10 @@ private void extracted(HashMap<String, Object> model, String theme) {
                     ).defaultIfEmpty(
                         "https://youimg1.c-ctrip.com/target/100m1b000001bj6if96CC.jpg");
                 model.put("rewardTopImgUrl", rewardTopImgUrl);
-                Mono<String> rewardTopTitle = this.settingFetcher.get(THEME_SETTING).map(setting ->
-                    setting.get("rewardTopTitle").asText()
-                ).defaultIfEmpty("感谢我的赞赏者们");
-                model.put("rewardTopTitle", rewardTopTitle);
+                Mono<Boolean> enableRewardRoll = this.settingFetcher.get(THEME_SETTING).map(setting ->
+                    setting.get("enableRewardRoll").asBoolean()
+                ).defaultIfEmpty(false);
+                model.put("enableRewardRoll", enableRewardRoll);
                 break;
             default:
                 break;

diff --git a/src/main/resources/extensions/settings.yaml b/src/main/resources/extensions/settings.yaml
@@ -43,17 +43,30 @@ spec:
           options:
             - label: 默认展示页面
               value: afdian
-            - label: 展示页2
+            - label: 顶图样式
               value: afdian2
+            - label: 滚动样式
+              value: afdian3
+        - $formkit: text
+          name: rewardTopTitle
+          label: 标题文字
+          placeholder: 请输入文字内容
+          value: 感谢我的赞赏者们
+        - $formkit: radio
+          name: enableRewardRoll
+          id: enableRewardRoll
+          key: enableRewardRoll
+          label: 顶部图片展示
+          if: $get(themeStyle).value == 'afdian2'
+          value: true
+          options:
+            - label: 启用
+              value: true
+            - label: 禁用
+              value: false
         - $formkit: url
           name: rewardTopImgUrl
           label: 顶部图片URL
-          if: $get(themeStyle).value == 'afdian2'
+          if: $get(themeStyle).value == 'afdian2' && $get(enableRewardRoll).value
           placeholder: 请输入顶部图片地址
-          value: https://youimg1.c-ctrip.com/target/100m1b000001bj6if96CC.jpg
-        - $formkit: text
-          name: rewardTopTitle
-          label: 顶部图片文字
-          if: $get(themeStyle).value == 'afdian2'
-          placeholder: 请输入顶部图片文字内容
-          value: 感谢我的赞赏者们
+          value: https://youimg1.c-ctrip.com/target/100m1b000001bj6if96CC.jpg
diff --git a/src/main/resources/static/afdian2.min.css b/src/main/resources/static/afdian2.min.css
@@ -1227,3 +1227,4 @@ html {
 	overflow:hidden;
 	margin-top:0;
 }
+