From d05900b160df0bb183badcf5903d15302badbd9a Mon Sep 17 00:00:00 2001 From: HapeLee <1321903405@qq.com> Date: Sat, 17 Jan 2026 07:20:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E6=88=91=E8=A6=81?= =?UTF-8?q?=E7=9D=A1=E8=A7=89=E4=BA=86=E5=AD=A9=E5=AD=90=E4=BB=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test.yml | 56 +++++++++++++++++-- .../io/legado/app/help/config/AppConfig.kt | 13 +++++ app/src/main/res/values-zh-rCN/strings.xml | 5 -- app/src/main/res/values/strings.xml | 5 -- 4 files changed, 63 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9cf6ba929..025404de2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -167,7 +167,7 @@ jobs: echo "VersionName: $APP_VERSION_NAME" echo "VersionCode (Commit Number): $COMMIT_NUMBER" chmod +x gradlew - ./gradlew assemble${{ env.product }}Release + ./gradlew assemble${{ env.product }}Release env: COMMIT_NUMBER: ${{ env.COMMIT_NUMBER_VAL }} APP_VERSION_NAME: ${{ env.VERSIONL }} @@ -264,7 +264,7 @@ jobs: with: fetch-depth: 0 - # 1. 必须先下载 build 任务上传的 APK + # 1. 下载 build 任务上传的 APK - name: 下载所有 APK Artifacts uses: actions/download-artifact@v4 with: @@ -272,7 +272,7 @@ jobs: path: artifacts merge-multiple: true - # 2. 运行你写好的重命名逻辑（确保文件名符合 Release 要求） + # 2. 重命名逻辑 - name: 整理并重命名 APK 文件 id: organize_apks run: | @@ -283,12 +283,56 @@ jobs: find artifacts -maxdepth 1 -type f -name '*armeabi-v7a.apk' -exec mv {} "artifacts/legado-${VERSIONL}-armeabi-v7a.apk" \; ls -l artifacts/ - # 3. 获取日志 (保持你原来的步骤) + # + # 获取 Commit 记录并格式化为 Release Body + # - name: 获取 Commit 记录 id: get_commits - # ... (此处省略你原来的脚本内容) + run: | + # prepare Job 中计算出的日志起点 Tag (LAST_TAG_FOR_LOG) + LAST_TAG="${{ needs.prepare.outputs.latest_tag }}" + + # 获取从上一个 Tag 到当前 HEAD 的所有 Commit 消息 + # --no-merges: 排除合并提交 + COMMIT_LOG=$(git log "$LAST_TAG"..HEAD --pretty=format:"* %s" --no-merges) + + if [ -z "$COMMIT_LOG" ]; then + RELEASE_BODY=$(cat <> $GITHUB_OUTPUT + echo "$RELEASE_BODY" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + + echo "生成的 Release Body:" + echo "$RELEASE_BODY" - # 4. 创建 Release 并上传 (自动处理 Tag 和文件) + - name: 创建 Tag + run: | + # 检查 Tag 是否已存在，避免重复创建 + if ! git tag -l ${{ needs.prepare.outputs.versionL }} | grep -q ${{ needs.prepare.outputs.versionL }}; then + git tag ${{ needs.prepare.outputs.versionL }} + git push origin ${{ needs.prepare.outputs.versionL }} + else + echo "Tag ${{ needs.prepare.outputs.versionL }} 已存在，跳过创建。" + fi + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # 4. 创建 Release 并上传 - name: 创建 GitHub Release 并上传文件 uses: softprops/action-gh-release@v2 with: diff --git a/app/src/main/java/io/legado/app/help/config/AppConfig.kt b/app/src/main/java/io/legado/app/help/config/AppConfig.kt index 642560428..6711223fa 100644 --- a/app/src/main/java/io/legado/app/help/config/AppConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/AppConfig.kt @@ -53,14 +53,27 @@ object AppConfig : SharedPreferences.OnSharedPreferenceChangeListener { var themeMode = appCtx.getPrefString(PreferKey.themeMode, "0") var AppTheme = appCtx.getPrefString(PreferKey.appTheme, "0") + var containerOpacity = appCtx.getPrefInt(PreferKey.containerOpacity, 100) var useDefaultCover = appCtx.getPrefBoolean(PreferKey.useDefaultCover, false) var optimizeRender = CanvasRecorderFactory.isSupport && appCtx.getPrefBoolean(PreferKey.optimizeRender, false) var recordLog = appCtx.getPrefBoolean(PreferKey.recordLog) + var webServiceAutoStart = appCtx.getPrefBoolean(PreferKey.webServiceAutoStart, false) + + // -- lyc 版本特性 -- + var adaptSpecialStyle = appCtx.getPrefBoolean(PreferKey.adaptSpecialStyle, true) + var useUnderline = appCtx.getPrefBoolean(PreferKey.useUnderline, false) + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { when (key) { + PreferKey.adaptSpecialStyle -> adaptSpecialStyle = + appCtx.getPrefBoolean(PreferKey.adaptSpecialStyle, true) + + PreferKey.useUnderline -> useUnderline = + appCtx.getPrefBoolean(PreferKey.useUnderline, false) + PreferKey.appTheme -> { AppTheme = appCtx.getPrefString(PreferKey.appTheme, "0") } diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 31183d687..41469116f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1380,9 +1380,4 @@ %d 音频缓存保留时间(分钟) 当前%d, 输入 0 代表退出即刻清理。 - 启动应用时打开Web服务 - 听书预加载数量 - %d - 音频缓存保留时间(分钟) - 当前%d, 输入 0 代表退出即刻清理。 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b40778013..798039028 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1385,9 +1385,4 @@ %d 音频缓存保留时间(分钟) 当前%d, 输入 0 代表退出即刻清理。 - 启动应用时打开Web服务 - 听书预加载数量 - %d - 音频缓存保留时间(分钟) - 当前%d, 输入 0 代表退出即刻清理。