merge+review(C84): 合并 origin/beta 0bb2601e38 并复评合并带入改动与 dev3 未推送 4 提交，修复 10 项

Browse source

Verification: 双 flavor arm64 Debug Java 编译 BUILD SUCCESSFUL；定向单测聚合 208 例 0 失败 0 错误；check_ui_tokens.sh PASS（violations=0、hex_layouts=0、contrast 38 对 0 失败 min=4.28）；4 组变异全部如期转红并还原（substr→LIKE、catchBlock 缩进漂移、删首个 catch、去掉 foreground-eof-recovery）；git diff --check 与冲突标记扫描为空；零复活/零丢失 A=1(仅本任务新文档) B=0 C=0 D 探针自检有效 E=4(全为本地未推送内容)

Task-Guard: C84-beta-merge-review-dev3-20261019

...

This commit is contained in:

Silent1566 2026-10-20 02:49:18 +08:00

parent c88f2896ac 0bb2601e38

commit 13a093ad37

28 changed files with 2169 additions and 229 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

15

app/src/main/java/com/fongmi/android/tv/db/dao/HistoryDao.java

View file

81

app/src/main/java/com/fongmi/android/tv/playback/PlaybackApi.java

View file

20

app/src/main/java/com/fongmi/android/tv/playback/PlaybackFieldPolicy.java

View file

12

app/src/main/java/com/fongmi/android/tv/playback/PlaybackProgressInput.java

View file

47

app/src/main/java/com/fongmi/android/tv/playback/PlaybackProgressWriter.java

View file

30

app/src/main/java/com/fongmi/android/tv/playback/PlaybackRecord.java

View file

13

app/src/main/java/com/fongmi/android/tv/player/PlayerManager.java

View file

17

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

View file

2

app/src/main/java/com/fongmi/android/tv/server/Nano.java

View file

158

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

View file

35

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

View file

48

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

View file

36

app/src/test/java/com/fongmi/android/tv/db/dao/HistoryDaoTest.java

View file

130

app/src/test/java/com/fongmi/android/tv/playback/PlaybackEpisodeIdTest.java

View file

108

app/src/test/java/com/fongmi/android/tv/playback/PlaybackHistoryDiagnosticsWiringTest.java

View file

41

app/src/test/java/com/fongmi/android/tv/playback/PlaybackHistoryLimitTest.java

View file

82

app/src/test/java/com/fongmi/android/tv/playback/PlaybackProgressWriterEpisodeTest.java

View file

16

app/src/test/java/com/fongmi/android/tv/player/PlayerManagerSwitchCauseSourceTest.java

View file

105

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

View file

74

app/src/test/java/com/fongmi/android/tv/server/process/PlaybackHistoryApiTest.java

View file

24

app/src/test/java/com/fongmi/android/tv/ui/dialog/SiteHealthReportDialogSourceTest.java

View file

109

docs/C82-beta-merge-review-dev2-20261019.md

View file

49

docs/C81-upstream-sync-silent1566.md → docs/C83-upstream-sync-silent1566.md

View file

174

docs/C84-beta-merge-review-dev3-20261019.md

View file

161

docs/MPV-BUFFERING-STALL-WATCHDOG-20261017.md

View file

444

docs/PC-REALTIME-SYNC-01-android-contract-gap.md

View file

5

docs/upstream-player-dependency-merge-assessment-2026-08-20.md

View file