merge: 合并 origin/beta 最新代码（PR#427-#432：小说朗读/去广告总时长/搜索下拉对比度/站点注入整页/mobile 电池块）并复评 dev2 加载圈族 6 个已提交未推送提交

Browse source

Verification: 合并 origin/beta 819003db8f（0 冲突，MERGE_HEAD=beta tip）；合并结果树 cd5c370c == git merge-tree --write-tree 自动合并结果树；零复活三层证据通过（严格复活数 0，--diff-filter=D 空，47 条 beta 真移除路径命中 0，检测器自检通过）；双 flavor Java 编译 + 双 flavor AndroidTest Java 编译 BUILD SUCCESSFUL；双 flavor 全量 JVM 套件失败集与未触碰基线 29d52ab238 逐类一致（leanback 4148/8 失败 7 类、mobile 4983/7 失败 6 类，均既有 CRLF/Windows renameTo 环境问题，0 新增失败）；定向 VideoActivityLayoutTest 155/155、TmdbDetailDirectPlayTransitionSourceTest 4/4、PlayerDisplaySettingSyncTest 7/7、PlaybackOwnershipSourceTest 16/16 全绿；git diff --check 与 --cached --check 退出码 0，冲突标记 0；构建后 gradlew clean 完成

Task-Guard: C57-beta-merge-review-dev2-20261009

...

This commit is contained in:

Silent1566 2026-10-10 19:41:55 +08:00

parent b6b8e7a375 819003db8f

commit df7f7ff580

61 changed files with 8525 additions and 200 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

431

app/src/androidTest/java/com/fongmi/android/tv/tts/ReaderTtsDeviceTest.java

View file

21

app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java

View file

6

app/src/main/AndroidManifest.xml

View file

529

app/src/main/assets/reader.html

View file

4

app/src/main/java/androidx/media3/mpvplayer/MpvHlsProxy.java

View file

264

app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupManager.java vendored

View file

8

app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupMode.java vendored

View file

4

app/src/main/java/com/fongmi/android/tv/cache/CachePolicyEngine.java vendored

View file

4

app/src/main/java/com/fongmi/android/tv/player/exo/ExoHlsAdblockDataSource.java

View file

4

app/src/main/java/com/fongmi/android/tv/server/process/M3u8.java

View file

598

app/src/main/java/com/fongmi/android/tv/service/ReaderTtsService.java

View file

391

app/src/main/java/com/fongmi/android/tv/tts/AudioFileTtsEngine.java

View file

34

app/src/main/java/com/fongmi/android/tv/tts/BaiduTtsEngine.java

View file

427

app/src/main/java/com/fongmi/android/tv/tts/EdgeTtsEngine.java

View file

177

app/src/main/java/com/fongmi/android/tv/tts/HttpTtsEngine.java

View file

387

app/src/main/java/com/fongmi/android/tv/tts/ReaderTtsController.java

View file

352

app/src/main/java/com/fongmi/android/tv/tts/SystemTtsEngine.java

View file

139

app/src/main/java/com/fongmi/android/tv/tts/TtsAudioCache.java

View file

63

app/src/main/java/com/fongmi/android/tv/tts/TtsEngine.java

View file

58

app/src/main/java/com/fongmi/android/tv/tts/TtsEngineConfig.java

View file

152

app/src/main/java/com/fongmi/android/tv/tts/TtsEngines.java

View file

331

app/src/main/java/com/fongmi/android/tv/tts/TtsHttpRule.java

View file

47

app/src/main/java/com/fongmi/android/tv/tts/TtsOptions.java

View file

140

app/src/main/java/com/fongmi/android/tv/tts/TtsTextSplitter.java

View file

20

app/src/main/java/com/fongmi/android/tv/tts/TtsVoice.java

View file

90

app/src/main/java/com/fongmi/android/tv/ui/dialog/CacheManagementDialog.java

View file

72

app/src/main/java/com/fongmi/android/tv/ui/dialog/CustomCspDialog.java

View file

286

app/src/main/java/com/fongmi/android/tv/ui/web/WebReaderActivity.java

View file

48

app/src/main/java/com/fongmi/android/tv/utils/HlsAdblockNotice.java

View file

14

app/src/main/res/values-zh-rCN/strings.xml

View file

14

app/src/main/res/values-zh-rTW/strings.xml

View file

14

app/src/main/res/values/strings.xml

View file

24

app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

View file

5

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/CollectFragment.java

View file

6

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SearchFragment.java

View file

21

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java

View file

38

app/src/mobile/res/layout/view_control_vod.xml

View file

252

app/src/test/java/com/fongmi/android/tv/cache/CacheFullCleanupTest.java vendored

View file

15

app/src/test/java/com/fongmi/android/tv/cache/CachePolicyEngineTest.java vendored

View file

3

app/src/test/java/com/fongmi/android/tv/player/exo/ExoHlsAdblockDataSourceTest.java

View file

147

app/src/test/java/com/fongmi/android/tv/tts/TtsHttpRuleTest.java

View file

97

app/src/test/java/com/fongmi/android/tv/tts/TtsTextSplitterTest.java

View file

149

app/src/test/java/com/fongmi/android/tv/ui/web/ReaderTtsBridgeSourceTest.java

View file

56

app/src/test/java/com/fongmi/android/tv/utils/HlsAdblockNoticeTest.java

View file

7

app/src/test/java/com/fongmi/android/tv/utils/HlsAdblockPipelineTest.java

View file

304

app/src/testLeanback/java/com/fongmi/android/tv/ui/dialog/CustomCspDialogLayoutTest.java

View file

95

app/src/testMobile/java/com/fongmi/android/tv/ui/activity/SearchScopePopupLayoutTest.java

View file

43

app/src/testMobile/java/com/fongmi/android/tv/ui/activity/VideoActivityLayoutTest.java

View file

113

docs/AD-NOTICE-01-ad-notice-total-duration.md

View file

305

docs/C52-beta-merge-review-dev1-20261009.md

View file

262

docs/C53-beta-merge-review-dev1-20261009.md

View file

138

docs/C54-beta-merge-review-dev4-20261009.md

View file

190

docs/C54-upstream-sync-silent1566.md

View file

297

docs/C55-beta-merge-review-dev1-20261009.md

View file

193

docs/C56-beta-merge-review-dev1-20261009.md

View file

201

docs/C57-beta-merge-review-dev2-20261010.md

View file

148

docs/C57-beta-merge-review-dev4-20261010.md

View file

34

docs/CACHE-MGMT-01-cache-management-design.md

View file

86

docs/MOBILE-SEARCH-DROPDOWN-CONTRAST-20261009.md

View file

209

docs/NOVEL-TTS-novel-read-aloud.md

View file

166

docs/SITE-INJECT-FULLPAGE-20261009.md

View file