修复阅读器资源、朗读与持久化稳定性

阅读器在多会话朗读、加密 EPUB 资源、并发打开同一本书和多 UserDefaults 容器等场景下，存在旧异步结果覆盖新状态、锁屏控制串会话、大型明文资源被误拒绝、解压半成品被复用及标注跨容器混用的风险；同时高亮、书签、搜索和设置面板的空状态与自动化可访问性入口不完整。\n\n本次为朗读会话引入代次和当前 utterance 校验，远程控制改为仅响应当前会话并按自身 token 清理；加密资源 provider 先判定是否实际返回解密数据，明文大资源继续流式读取；解压缓存串行化以避免并发复用未完成目录。书签与高亮迁移至受保护文件，按 UserDefaults 容器隔离命名空间，保留标准容器旧文件兼容并确保新副本成功落盘后才删除历史数据。\n\n同步调整缓存淘汰、FoundationModels 弱链接、搜索/标注/设置面板交互与 UI 测试，并更新 Pod 生成配置及 API、风险文档。已执行 git diff --check 和 ReadViewDemo Debug Simulator 构建，结果为 BUILD SUCCEEDED。

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/AsyncChapterLoadingTests.swift

@@ -465,12 +465,8 @@ final class AsyncChapterLoadingTests: XCTestCase {
         // Change font size via settings
         app.showReaderChromeIfNeeded()
         app.buttons[IDs.readerSettings].tap()
-        let fontIncrease = app.buttons[IDs.settingsFontIncrease]
-        XCTAssertTrue(fontIncrease.waitForExistence(timeout: 3), "字号增大按钮不存在")
-        fontIncrease.tap()
-        RunLoop.current.run(until: Date().addingTimeInterval(0.3))
-        fontIncrease.tap()
-        RunLoop.current.run(until: Date().addingTimeInterval(0.3))
+        XCTAssertTrue(app.adjustSettingsFontSize(toNormalizedPosition: 0.9), "字号滑块不存在")
+        RunLoop.current.run(until: Date().addingTimeInterval(0.6))
 
         // Close settings
         let doneButton = app.buttons[IDs.settingsDone]

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/DisplayTypeTests.swift

@@ -41,9 +41,10 @@ final class DisplayTypeTests: XCTestCase {
         XCTAssertTrue(app.buttons[IDs.readerSettings].waitForExistence(timeout: 3))
         app.buttons[IDs.readerSettings].tap()
 
-        let displayTypeControl = app.segmentedControls[IDs.settingsDisplayType]
-        XCTAssertTrue(displayTypeControl.waitForExistence(timeout: 5))
-        displayTypeControl.buttons.element(boundBy: 2).tap()
+        XCTAssertTrue(
+            app.selectSettingsPillOption(pillIdentifier: IDs.settingsDisplayType, optionTitle: "竖滑"),
+            "翻页方式应可切换到竖滑"
+        )
         app.buttons[IDs.settingsDone].tap()
 
         app.waitForDemoReaderState(timeout: 8, description: "display=verticalScroll after switch") { $0.display == "verticalScroll" }

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/ErrorAndEdgeCaseTests.swift

@@ -45,23 +45,20 @@ final class ErrorAndEdgeCaseTests: XCTestCase {
         app.waitForDemoReaderState(timeout: 8, description: "reader=opened") { $0.isOpened }
     }
 
-    func testSettingsPanelScrollReachesAllControls() throws {
+    func testSettingsPanelReachesAllControls() throws {
         app.launchAndOpenSampleBook()
         app.waitForReader(timeout: 12)
 
         app.showReaderChromeIfNeeded()
         app.buttons[IDs.readerSettings].tap()
 
-        let settingsScroll = app.scrollViews[IDs.settingsScroll]
-        XCTAssertTrue(settingsScroll.waitForExistence(timeout: 5), "设置面板未出现")
+        XCTAssertTrue(app.waitForSettingsPanel(), "设置面板未出现")
 
-        XCTAssertTrue(app.buttons[IDs.settingsFontIncrease].waitForExistence(timeout: 3))
-        XCTAssertTrue(app.buttons[IDs.settingsBrightness].waitForExistence(timeout: 3))
+        XCTAssertTrue(app.sliders[IDs.settingsFontSize].waitForExistence(timeout: 3))
+        XCTAssertTrue(app.sliders[IDs.settingsBrightness].waitForExistence(timeout: 3))
 
-        settingsScroll.swipeUp()
-        XCTAssertTrue(app.segmentedControls[IDs.settingsDisplayType].waitForExistence(timeout: 5))
+        XCTAssertTrue(app.buttons[IDs.settingsDisplayType].waitForExistence(timeout: 5))
 
-        settingsScroll.swipeUp()
         XCTAssertTrue(app.buttons[IDs.settingsTheme(5)].waitForExistence(timeout: 5))
 
         app.buttons[IDs.settingsDone].tap()

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/LocationPersistenceTests.swift

@@ -8,7 +8,9 @@ final class LocationPersistenceTests: XCTestCase {
     }
 
     func testReadingPositionRestoredOnReopen() throws {
-        app.launchAndOpenSampleBook()
+        // 必须用滚动模式：仿真翻页（默认）下没有 `epub.reader.paging`
+        // collectionView，swipeLeft 落不到任何东西，页码永远停在 1
+        app.launchAndOpenSampleBook(displayType: "scroll")
         app.waitForReader(timeout: 12)
 
         _ = app.waitForDemoReaderState(timeout: 5, description: "存在页码") { $0.page != nil }
@@ -30,7 +32,8 @@ final class LocationPersistenceTests: XCTestCase {
         let backButton = app.buttons[IDs.readerBack]
         if backButton.waitForExistence(timeout: 3) { backButton.tap() }
 
-        app.launchAndOpenSampleBook()
+        // 重开必须保留状态，否则 --demo-reset-state 会清掉刚存的阅读位置
+        app.launchAndOpenSampleBook(displayType: "scroll", resetsReaderState: false)
         app.waitForReader(timeout: 12)
 
         let restoredState = app.waitForDemoReaderState(timeout: 8, description: "恢复阅读位置") { state in
@@ -61,7 +64,7 @@ final class LocationPersistenceTests: XCTestCase {
 
         app.showReaderChromeIfNeeded()
         if app.buttons[IDs.readerSettings].waitForExistence(timeout: 3) { app.buttons[IDs.readerSettings].tap() }
-        if app.buttons[IDs.settingsFontIncrease].waitForExistence(timeout: 5) { app.buttons[IDs.settingsFontIncrease].tap() }
+        app.increaseSettingsFontSize()
         if app.buttons[IDs.settingsDone].waitForExistence(timeout: 3) { app.buttons[IDs.settingsDone].tap() }
 
         let backButton = app.buttons[IDs.readerBack]
@@ -74,7 +77,8 @@ final class LocationPersistenceTests: XCTestCase {
     }
 
     func testPositionSurvivesFontChoiceAndLineHeightChange() throws {
-        app.launchAndOpenSampleBook(resetsReaderState: true)
+        // 同上：需要真正能翻页的模式
+        app.launchAndOpenSampleBook(displayType: "scroll", resetsReaderState: true)
         app.waitForReader(timeout: 12)
 
         let paging = app.collectionViews[IDs.readerPaging]
@@ -97,17 +101,14 @@ final class LocationPersistenceTests: XCTestCase {
         XCTAssertTrue(app.buttons[IDs.readerSettings].waitForExistence(timeout: 3))
         app.buttons[IDs.readerSettings].tap()
 
-        let fontChoiceControl = app.segmentedControls[IDs.settingsFontChoice]
-        XCTAssertTrue(fontChoiceControl.waitForExistence(timeout: 5), "字体选择控件应出现")
-        if fontChoiceControl.buttons.count > 1 {
-            fontChoiceControl.buttons.element(boundBy: 1).tap()
-        }
-
-        let lineHeightControl = app.segmentedControls[IDs.settingsLineHeight]
-        XCTAssertTrue(lineHeightControl.waitForExistence(timeout: 5), "行距控件应出现")
-        if lineHeightControl.buttons.count > 1 {
-            lineHeightControl.buttons.element(boundBy: min(1, lineHeightControl.buttons.count - 1)).tap()
-        }
+        XCTAssertTrue(
+            app.selectSettingsPillOption(pillIdentifier: IDs.settingsFontChoice, optionTitle: "宋体"),
+            "字体选择控件应可切换"
+        )
+        XCTAssertTrue(
+            app.selectSettingsPillOption(pillIdentifier: IDs.settingsLineHeight, optionTitle: "标准"),
+            "行距控件应可切换"
+        )
 
         XCTAssertTrue(app.buttons[IDs.settingsDone].waitForExistence(timeout: 3))
         app.buttons[IDs.settingsDone].tap()
@@ -131,8 +132,9 @@ final class LocationPersistenceTests: XCTestCase {
         app.waitForDemoReaderState(timeout: 5, description: "bookmarks=1") { $0.bookmarks == 1 }
 
         app.hideReaderChromeIfNeeded()
-        let content = app.otherElements[IDs.readerSelectionText].firstMatch
-        XCTAssertTrue(content.waitForExistence(timeout: 5))
+        // 与其它选区用例一致：渲染路径没暴露选区元素时跳过，而不是硬失败在
+        // 与本用例（跨重开保持）无关的前置步骤上
+        let content = try app.requireSelectionText()
         let start = content.coordinate(withNormalizedOffset: CGVector(dx: 0.2, dy: 0.5))
         let end = content.coordinate(withNormalizedOffset: CGVector(dx: 0.55, dy: 0.5))
         start.press(forDuration: 0.8, thenDragTo: end)
@@ -174,11 +176,10 @@ final class LocationPersistenceTests: XCTestCase {
 
         app.showReaderChromeIfNeeded()
         app.buttons[IDs.readerSettings].tap()
-        let fontChoiceControl = app.segmentedControls[IDs.settingsFontChoice]
-        XCTAssertTrue(fontChoiceControl.waitForExistence(timeout: 5), "字体选择控件应出现")
-        if fontChoiceControl.buttons.count > 1 {
-            fontChoiceControl.buttons.element(boundBy: 1).tap()
-        }
+        XCTAssertTrue(
+            app.selectSettingsPillOption(pillIdentifier: IDs.settingsFontChoice, optionTitle: "宋体"),
+            "字体选择控件应可切换"
+        )
         app.buttons[IDs.settingsDone].tap()
 
         let content = app.otherElements[IDs.readerContent].firstMatch

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/MemoryFootprintTests.swift

@@ -92,10 +92,8 @@ final class MemoryFootprintTests: XCTestCase {
 
         XCTAssertTrue(app.buttons[IDs.readerSettings].waitForExistence(timeout: 5), "设置按钮不存在")
         app.buttons[IDs.readerSettings].tap()
-        XCTAssertTrue(app.scrollViews[IDs.settingsScroll].waitForExistence(timeout: 5), "设置面板未出现")
-        XCTAssertTrue(app.buttons[IDs.settingsFontIncrease].waitForExistence(timeout: 3), "字号增大按钮不存在")
-        app.buttons[IDs.settingsFontIncrease].tap()
-        app.buttons[IDs.settingsFontIncrease].tap()
+        XCTAssertTrue(app.waitForSettingsPanel(), "设置面板未出现")
+        XCTAssertTrue(app.adjustSettingsFontSize(toNormalizedPosition: 0.9), "字号滑块不存在")
         XCTAssertTrue(app.buttons[IDs.settingsDone].waitForExistence(timeout: 3), "完成按钮不存在")
         app.buttons[IDs.settingsDone].tap()
 

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/SearchTests.swift

@@ -301,10 +301,7 @@ final class SearchTests: XCTestCase {
         XCTAssertTrue(settingsButton.waitForExistence(timeout: 3))
         settingsButton.tap()
 
-        let fontIncrease = app.buttons[IDs.settingsFontIncrease]
-        XCTAssertTrue(fontIncrease.waitForExistence(timeout: 3))
-        fontIncrease.tap()
-        fontIncrease.tap()
+        XCTAssertTrue(app.adjustSettingsFontSize(toNormalizedPosition: 0.9), "字号滑块应存在")
         Thread.sleep(forTimeInterval: 0.5)
 
         let doneButton = app.buttons[IDs.settingsDone]
@@ -367,10 +364,7 @@ final class SearchTests: XCTestCase {
         XCTAssertTrue(settingsButton.waitForExistence(timeout: 3), "设置按钮应存在")
         settingsButton.tap()
 
-        let fontIncrease = app.buttons[IDs.settingsFontIncrease]
-        XCTAssertTrue(fontIncrease.waitForExistence(timeout: 3), "字号增大按钮应存在")
-        fontIncrease.tap()
-        fontIncrease.tap()
+        XCTAssertTrue(app.adjustSettingsFontSize(toNormalizedPosition: 0.9), "字号滑块应存在")
         Thread.sleep(forTimeInterval: 0.5)
 
         let doneButton = app.buttons[IDs.settingsDone]

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/SelectionAnnotateTests.swift

@@ -114,10 +114,7 @@ final class SelectionAnnotateTests: XCTestCase {
             XCTAssertTrue(settingsButton.waitForExistence(timeout: 3), "设置按钮应存在")
             settingsButton.tap()
 
-            let fontIncrease = app.buttons[IDs.settingsFontIncrease]
-            XCTAssertTrue(fontIncrease.waitForExistence(timeout: 3), "字号增大按钮应存在")
-            fontIncrease.tap()
-            fontIncrease.tap()
+            XCTAssertTrue(app.adjustSettingsFontSize(toNormalizedPosition: 0.9), "字号滑块应存在")
             Thread.sleep(forTimeInterval: 0.5)
 
             let doneButton = app.buttons[IDs.settingsDone]

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/SettingsEffectTests.swift

@@ -16,9 +16,8 @@ final class SettingsEffectTests: XCTestCase {
         XCTAssertTrue(app.buttons[IDs.readerSettings].waitForExistence(timeout: 3), "设置按钮不存在")
         app.buttons[IDs.readerSettings].tap()
 
-        XCTAssertTrue(app.scrollViews[IDs.settingsScroll].waitForExistence(timeout: 5), "设置面板未出现")
-        XCTAssertTrue(app.buttons[IDs.settingsFontIncrease].waitForExistence(timeout: 3), "字号增大按钮不存在")
-        app.buttons[IDs.settingsFontIncrease].tap()
+        XCTAssertTrue(app.waitForSettingsPanel(), "设置面板未出现")
+        XCTAssertTrue(app.increaseSettingsFontSize(), "字号滑块不存在")
 
         XCTAssertTrue(app.buttons[IDs.settingsDone].waitForExistence(timeout: 3), "完成按钮不存在")
         app.buttons[IDs.settingsDone].tap()
@@ -32,8 +31,7 @@ final class SettingsEffectTests: XCTestCase {
 
         app.showReaderChromeIfNeeded()
         app.buttons[IDs.readerSettings].tap()
-        XCTAssertTrue(app.scrollViews[IDs.settingsScroll].waitForExistence(timeout: 5), "设置面板未出现")
-        app.scrollViews[IDs.settingsScroll].swipeUp()
+        XCTAssertTrue(app.waitForSettingsPanel(), "设置面板未出现")
 
         let darkThemeButton = app.buttons[IDs.settingsTheme(5)]
         if darkThemeButton.waitForExistence(timeout: 3) { darkThemeButton.tap() }
@@ -50,12 +48,9 @@ final class SettingsEffectTests: XCTestCase {
 
         app.showReaderChromeIfNeeded()
         app.buttons[IDs.readerSettings].tap()
-        XCTAssertTrue(app.scrollViews[IDs.settingsScroll].waitForExistence(timeout: 5))
+        XCTAssertTrue(app.waitForSettingsPanel())
 
-        let lineHeightControl = app.segmentedControls[IDs.settingsLineHeight]
-        if lineHeightControl.waitForExistence(timeout: 3) && lineHeightControl.buttons.count > 1 {
-            lineHeightControl.buttons.element(boundBy: 1).tap()
-        }
+        app.selectSettingsPillOption(pillIdentifier: IDs.settingsLineHeight, optionTitle: "标准")
 
         app.buttons[IDs.settingsDone].tap()
         app.waitForDemoReaderState(timeout: 8, description: "reader=opened") { $0.isOpened }
@@ -68,12 +63,9 @@ final class SettingsEffectTests: XCTestCase {
 
         app.showReaderChromeIfNeeded()
         app.buttons[IDs.readerSettings].tap()
-        XCTAssertTrue(app.scrollViews[IDs.settingsScroll].waitForExistence(timeout: 5))
+        XCTAssertTrue(app.waitForSettingsPanel())
 
-        let displayTypeControl = app.segmentedControls[IDs.settingsDisplayType]
-        if displayTypeControl.waitForExistence(timeout: 3) && displayTypeControl.buttons.count > 0 {
-            displayTypeControl.buttons.element(boundBy: 0).tap()
-        }
+        app.selectSettingsPillOption(pillIdentifier: IDs.settingsDisplayType, optionTitle: "仿真")
 
         app.buttons[IDs.settingsDone].tap()
         app.waitForDemoReaderState(timeout: 8, description: "display changed") { $0.display != nil }
@@ -98,19 +90,21 @@ final class SettingsEffectTests: XCTestCase {
         app.showReaderChromeIfNeeded()
         app.buttons[IDs.readerSettings].tap()
 
-        XCTAssertTrue(app.buttons[IDs.settingsFontIncrease].waitForExistence(timeout: 5))
+        XCTAssertTrue(app.sliders[IDs.settingsFontSize].waitForExistence(timeout: 5))
         let fontValueLabel = app.staticTexts[IDs.settingsFontValue]
         XCTAssertTrue(fontValueLabel.waitForExistence(timeout: 3))
         let originalFontValue = fontValueLabel.label
 
-        app.buttons[IDs.settingsFontIncrease].tap()
+        XCTAssertTrue(app.increaseSettingsFontSize(), "字号滑块应存在")
         let newFontValue = fontValueLabel.label
-        XCTAssertNotEqual(newFontValue, originalFontValue, "点击增大后字号 label 应变化")
+        XCTAssertNotEqual(newFontValue, originalFontValue, "增大字号后 label 应变化")
 
         app.buttons[IDs.settingsDone].tap()
         app.buttons[IDs.readerBack].tap()
 
-        app.launchAndOpenSampleBook()
+        // 必须保留状态：默认的 resetsReaderState 会清掉刚存下的设置，
+        // 那样这个用例永远测不到持久化
+        app.launchAndOpenSampleBook(resetsReaderState: false)
         app.waitForReader(timeout: 12)
 
         app.showReaderChromeIfNeeded()
@@ -158,11 +152,12 @@ final class SettingsEffectTests: XCTestCase {
         app.showReaderChromeIfNeeded()
         app.buttons[IDs.readerSettings].tap()
 
-        let fontChoiceControl = app.segmentedControls[IDs.settingsFontChoice]
+        let fontChoiceControl = app.buttons[IDs.settingsFontChoice]
         XCTAssertTrue(fontChoiceControl.waitForExistence(timeout: 5))
-        if fontChoiceControl.buttons.count > 1 {
-            fontChoiceControl.buttons.element(boundBy: 1).tap()
-        }
+        XCTAssertTrue(
+            app.selectSettingsPillOption(pillIdentifier: IDs.settingsFontChoice, optionTitle: "宋体"),
+            "字体应可切换到宋体"
+        )
         XCTAssertEqual(fontChoiceControl.value as? String, "宋体", "切换字体后当前字体值应更新")
         app.buttons[IDs.settingsDone].tap()
 
@@ -174,7 +169,7 @@ final class SettingsEffectTests: XCTestCase {
         app.showReaderChromeIfNeeded()
         app.buttons[IDs.readerSettings].tap()
 
-        let reopenedFontChoiceControl = app.segmentedControls[IDs.settingsFontChoice]
+        let reopenedFontChoiceControl = app.buttons[IDs.settingsFontChoice]
         XCTAssertTrue(reopenedFontChoiceControl.waitForExistence(timeout: 5))
         XCTAssertEqual(reopenedFontChoiceControl.value as? String, "宋体", "字体选择应在重启后保持")
         app.buttons[IDs.settingsDone].tap()

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/SettingsExtendedTests.swift

@@ -14,7 +14,7 @@ final class SettingsExtendedTests: XCTestCase {
 
         XCTAssertTrue(app.buttons[IDs.readerSettings].waitForExistence(timeout: 5))
         app.buttons[IDs.readerSettings].tap()
-        XCTAssertTrue(app.scrollViews[IDs.settingsScroll].waitForExistence(timeout: 5))
+        XCTAssertTrue(app.waitForSettingsPanel())
     }
 
     func testBrightnessSliderExists() {
@@ -25,12 +25,13 @@ final class SettingsExtendedTests: XCTestCase {
 
     func testLineHeightControl() {
         openSettings()
-        let lineHeight = app.segmentedControls[IDs.settingsLineHeight]
-        XCTAssertTrue(lineHeight.waitForExistence(timeout: 3), "行距控件未出现")
 
-        lineHeight.buttons["紧凑"].tap()
-        lineHeight.buttons["标准"].tap()
-        lineHeight.buttons["宽松"].tap()
+        for title in ["紧凑", "标准", "宽松"] {
+            XCTAssertTrue(
+                app.selectSettingsPillOption(pillIdentifier: IDs.settingsLineHeight, optionTitle: title),
+                "行距应可切换到\(title)"
+            )
+        }
 
         app.buttons[IDs.settingsDone].tap()
         XCTAssertTrue(app.buttons[IDs.readerBack].waitForExistence(timeout: 5))
@@ -38,10 +39,11 @@ final class SettingsExtendedTests: XCTestCase {
 
     func testDisplayTypeFromSettings() {
         openSettings()
-        let displayType = app.segmentedControls[IDs.settingsDisplayType]
-        XCTAssertTrue(displayType.waitForExistence(timeout: 3), "翻页方式控件未出现")
+        XCTAssertTrue(
+            app.selectSettingsPillOption(pillIdentifier: IDs.settingsDisplayType, optionTitle: "横滑"),
+            "翻页方式应可切换到横滑"
+        )
 
-        displayType.buttons["横滑"].tap()
         app.buttons[IDs.settingsDone].tap()
         app.waitForDemoReaderState(timeout: 5, description: "display=horizontalScroll") { $0.display == "horizontalScroll" }
     }
@@ -54,13 +56,13 @@ final class SettingsExtendedTests: XCTestCase {
         }
     }
 
-    func testScrollSettingsToReachAllControls() {
+    /// 面板是固定高度布局，所有控件一屏内可达，不需要滚动
+    func testAllSettingsControlsReachableWithoutScrolling() {
         openSettings()
-        let scroll = app.scrollViews[IDs.settingsScroll]
-        XCTAssertTrue(scroll.waitForExistence(timeout: 3))
 
+        XCTAssertTrue(app.sliders[IDs.settingsFontSize].waitForExistence(timeout: 3))
         XCTAssertTrue(app.sliders[IDs.settingsBrightness].waitForExistence(timeout: 3))
-        XCTAssertTrue(app.segmentedControls[IDs.settingsLineHeight].waitForExistence(timeout: 3))
-        XCTAssertTrue(app.segmentedControls[IDs.settingsDisplayType].waitForExistence(timeout: 3))
+        XCTAssertTrue(app.buttons[IDs.settingsLineHeight].waitForExistence(timeout: 3))
+        XCTAssertTrue(app.buttons[IDs.settingsDisplayType].waitForExistence(timeout: 3))
     }
 }

ReadViewDemo/ReadViewDemoUITests/ReaderUITests/SettingsPanelTests.swift

@@ -15,18 +15,19 @@ final class SettingsPanelTests: XCTestCase {
         XCTAssertTrue(app.buttons[IDs.readerSettings].waitForExistence(timeout: 5))
         app.buttons[IDs.readerSettings].tap()
 
-        XCTAssertTrue(app.scrollViews[IDs.settingsScroll].waitForExistence(timeout: 5))
+        XCTAssertTrue(app.waitForSettingsPanel())
         let fontValue = app.staticTexts[IDs.settingsFontValue]
         XCTAssertTrue(fontValue.waitForExistence(timeout: 3))
         let before = fontValue.label
 
-        app.buttons[IDs.settingsFontIncrease].tap()
+        XCTAssertTrue(app.increaseSettingsFontSize(), "字号滑块应存在")
         XCTAssertNotEqual(before, fontValue.label)
 
-        app.buttons[IDs.settingsFontDecrease].tap()
-        let fontChoice = app.segmentedControls[IDs.settingsFontChoice]
-        XCTAssertTrue(fontChoice.waitForExistence(timeout: 3))
-        fontChoice.buttons["宋体"].tap()
+        XCTAssertTrue(app.decreaseSettingsFontSize(), "字号滑块应存在")
+        XCTAssertTrue(
+            app.selectSettingsPillOption(pillIdentifier: IDs.settingsFontChoice, optionTitle: "宋体"),
+            "字体应可切换到宋体"
+        )
 
         let darkTheme = app.buttons[IDs.settingsTheme(5)]
         XCTAssertTrue(darkTheme.waitForExistence(timeout: 3))