flags.json 新增 custom_text 配置，便于更新/自定义显示内容

ColdeZhang · Aug 30, 2024 · ecd65f6 · ecd65f6
1 parent b4d1c9f
commit ecd65f6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "cn.lunadeer"
-version = "2.4.0-beta"
+version = "2.4.1-beta"
 
 java {
     toolchain.languageVersion.set(JavaLanguageVersion.of(21))

diff --git a/core/src/main/java/cn/lunadeer/dominion/dtos/Flag.java b/core/src/main/java/cn/lunadeer/dominion/dtos/Flag.java
@@ -85,10 +85,15 @@ public enum Flag {
     private Boolean default_value;
     private Boolean enable;
     private final Boolean dominion_only;
+    private Boolean custom_text = false;
+    private final String default_display_name;
+    private final String default_description;
 
     Flag(String flagName, String displayName, String desc, boolean defaultValue, boolean dominion_only, boolean enable) {
         this.flag_name = flagName;
+        this.default_display_name = displayName;
         this.display_name = displayName;
+        this.default_description = desc;
         this.description = desc;
         this.default_value = defaultValue;
         this.dominion_only = dominion_only;
@@ -221,6 +226,7 @@ public static JSONObject serializeToJson(Flag flag) {
         json.put("description", flag.getDescription());
         json.put("default_value", flag.getDefaultValue());
         json.put("enable", flag.getEnable());
+        json.put("custom_text", flag.custom_text);
         return json;
     }
 
@@ -238,13 +244,19 @@ public static void deserializeFromJson(JSONObject jsonObject) {
             try {
                 JSONObject flagJson = (JSONObject) jsonObject.get(flag.getFlagName());
                 if (flagJson != null) {
-                    flag.setDisplayName((String) flagJson.get("display_name"));
-                    flag.setDescription((String) flagJson.get("description"));
-                    flag.setDefaultValue((Boolean) flagJson.get("default_value"));
-                    flag.setEnable((Boolean) flagJson.get("enable"));
+                    flag.custom_text = (Boolean) flagJson.getOrDefault("custom_text", false);
+                    flag.setDefaultValue((Boolean) flagJson.getOrDefault("default_value", flag.getDefaultValue()));
+                    flag.setEnable((Boolean) flagJson.getOrDefault("enable", flag.getEnable()));
+                    if (flag.custom_text) { // 如果使用自定义文本 则从配置文件中读取
+                        flag.setDisplayName((String) flagJson.getOrDefault("display_name", flag.getDisplayName()));
+                        flag.setDescription((String) flagJson.getOrDefault("description", flag.getDescription()));
+                    } else {    // 否则设置为默认文本
+                        flag.setDisplayName(flag.default_display_name);
+                        flag.setDescription(flag.default_description);
+                    }
                 }
             } catch (Exception e) {
-                XLogger.warn("读取权限 %s 配置失败：%s，已跳过", flag.getFlagName(), e.getMessage());
+                XLogger.warn("读取权限 %s 配置失败：%s，已跳过，使用默认配置", flag.getFlagName(), e.getMessage());
             }
         }
     }