Silent1566
2a911a9e18
docs(AV-PROGRESS-04): 修正行号并记录合并 beta 后的独立复评结论
...
Verification: testLeanbackArm64_v8aDebugUnitTest TmdbDetailSeekProgressSourceTest+VideoActivitySeekProgressSourceTest = 3+3 tests, 0 failures (rerun by dispatcher); independent review PASS
Task-Guard: AV-PROGRESS-04-docfix
2026-11-04 01:15:50 +08:00
Silent1566
28d3ed286f
fix(progress): rebind leanback inline seek view after kernel rebuild
...
电视端「打开历史播放」落到 TmdbDetailActivity 内联播放。设置内核与历史记录内核
不一致时,startInlinePlayer() 里的 preparePlayer() 会在 PlaySpec 建立之前重建引擎,
那一刻 getKey() 为 null、isOwner() 判假,PlaybackActivity.onPlayerRebuild() 整段跳过
(含 setProgressPlayer),进度条继续读已释放的旧引擎,左右恒 00:00。
在重建后立即显式重绑 seek view 的 progress player,并新增 testLeanback 源码契约测试
钉住 preparePlayer -> setProgressPlayer -> startPlayer 的顺序与访问器用法。
Task-Guard: AV-PROGRESS-04
2026-11-03 23:07:31 +08:00
Silent1566
b10b9fff86
docs(tv): 记录 beta 合并复评与全量回归结果
...
Verification: testMobile 5625/6 failed (既有基线)、testLeanback 4863/8 failed (既有基线+CRLF 环境)、定向 313 tests 0 failed、compileLeanback exit 0
Task-Guard: beta-merge-rereview-20261103
2026-11-03 12:35:44 +08:00
Silent1566
3e8cd7d310
fix(tv): keep held direction keys moving through the episode grid
...
Verification: testMobileArm64_v8aDebugUnitTest TmdbEpisodeGridPolicyTest+TmdbDetailActivityLayoutTest+VideoActivityLayoutTest = 299 tests 0 failed; testLeanbackArm64_v8aDebugUnitTest NativeEnhancedPlaybackStyleFocusTest+SpeedAdjustKeyContractTest+VideoActivityLayoutTest = 18 tests 1 failed (pre-existing baseline, reproduced with git stash); device emulator-5554: both detail and playback episode grids advance per repeat while held, release clears the hold target with no snap-back, boundary rows clamp in place
Task-Guard: tv-episode-hold-repeat-20261102
2026-11-03 06:10:50 +08:00
Silent1566
53989159df
Merge pull request #515 from Silent1566/dev5
...
fix(episode): 修复粘连画质标记导致的集数解析错误
2026-11-02 10:03:42 +08:00
Silent1566
d31b7a584d
Merge pull request #516 from Silent1566/dev1
...
修复时长未知时进度条恒为 00:00 与点播被误判为直播
2026-11-02 10:03:14 +08:00
Silent1566
8382a49e04
修复时长未知时进度条恒为 00:00 与点播被误判为直播
...
展示层兜底:
- PlayerManager 新增 setDurationFallback(LongSupplier) 与 resolveDuration:引擎总时长未就绪(C.TIME_UNSET)时,进度条与中央浮层改用页面提供的历史集时长兜底,不再恒显 00:00;真实正时长永远优先,兜底取值先做局部快照,异常与小于等于 0 都视作没有兜底。
- CustomSeekView 同步接入 LongSupplier 兜底,updateTimeline/updateProgress/effectiveBufferedPosition 三处统一收敛,拖动预览与提交有意保留 currentDuration 优先。
- PlaybackActivity 提供 getDurationFallbackMs 钩子并在控制器就绪时接线,两端 VideoActivity 覆写为当前集历史时长。
判定层互补(去第三态):
- TimelineStreamKindPolicy.isVod 的比较改为大于等于,与 isLive 的小于恰好互补,60 秒整的点播不再同时不满足直播/点播(Exo/MPV/System 三内核共用)。
- IjkStreamScenePolicy 新增公开 isLive/isVod(Decision, duration),权威清单直接采纳,否则回落时长启发式;isVod 恒等于 isLive 取反,保证对外永不出现第三态。
- IjkStreamScenePolicy 非分段分支把 RTSP/RTMP 协议直播证据(PlaybackResourceClassifier 给出的 StreamKind.LIVE)作为直播判定依据,新增 Reason.PROTOCOL_LIVE,避免直播页左右键从换线路变成 seek、重试次数 6 降为 2;删除不可达的 LEGACY_DURATION_AMBIGUOUS 第三态。
- IjkPlayerEngine.isLive/isVod 改为委托 IjkStreamScenePolicy(Decision, duration)。
文档:docs/AV-PROGRESS-01 与 AV-PROGRESS-03 同步为现行契约(LongSupplier、Decision 委托、协议直播证据、已知窗口与取舍)。
验证:testLeanbackArm64_v8aDebugUnitTest(IjkStreamScenePolicyTest/TimelineStreamKindPolicyTest/VideoActivitySeekProgressSourceTest)与 testMobileArm64_v8aDebugUnitTest(前两个)均 BUILD SUCCESSFUL,XML failures=0;git diff --check 干净。
Verification: 定向单测 BUILD SUCCESSFUL:testLeanbackArm64_v8aDebugUnitTest + testMobileArm64_v8aDebugUnitTest(IjkStreamScenePolicyTest/TimelineStreamKindPolicyTest/VideoActivitySeekProgressSourceTest,XML failures=0);git diff --check 干净
Task-Guard: C117-BETA-MERGE-REVIEW-DEV1
2026-11-02 06:17:34 +08:00
Silent1566
77ec451c8f
fix(episode): 将画质/编码/音轨/片源合并为标记链正则,修复粘连标记导致的集号误解析
...
Verification: gradlew :app:testMobileArm64_v8aDebugUnitTest --tests *UtilTest* BUILD SUCCESSFUL; TEST-...UtilTest.xml tests=11 failures=0 errors=0 skipped=0 (after comment/assertion fix); 双轴评审(Standards+Spec)两轮通过, 104/104 断言无回归
Task-Guard: ep-quality-chain-strip
2026-11-02 02:57:53 +08:00
Silent1566
5ba7adc38b
fix(playback): 修复选集身份在播放页丢失的评审问题
...
第二轮双轴评审(Standards/Spec)确认后的修复与清理,均属 playback-episode-selection 任务:
- leanback VideoActivity.findIntentPlaybackEpisode:名称通道只采纳真实命中
(线路只有一集,或 getScore(playName, 集号) > 0),避免 Flag.find 的
position 槽位兜底被当成集名命中而抢答历史集身份通道。
- mobile VideoActivity.refreshSelectionAfterExternalPlayback:新增 mHistory 空守卫;
setVodRemarks 移入 sameHistoryIdentity 分支,与 setEpisodeUrl 同进同退,
不再落库「新集名 + 旧 URL」的矛盾身份。
- TmdbSeasonProgressStore:抽出 freshness(history)=max(createTime, updateTime)
作为唯一新旧口径,fromHistory 与 reconcile 共用,避免同一个类里两套「最新」
定义导致看完高季后被旧季快照覆盖。
- TmdbDetailActivity.renderEpisodes:删除三段恒真/恒假判断,收敛为
selectedSeasonNumber = availableSeasons.isEmpty() ? -1 : seasonForEpisode(...),
并删除「绝不拿别的季第一集顶替」这句与实现不符的注释。
- leanback 快速起播回落分支补 hideProgress(),避免转圈永久残留。
- 测试:删除 PlaybackSelectionLocatorSourceTest 中两条对整份源文件的恒真否定
断言与无生产调用方的死重载用例(6→5);DetailPlaybackHandoffSourceTest 删除
断言注释文本的用例,改为锁定新的季号推导表达式(仍 4 个)。
- History.rebindPlaybackRoute:只改注释,说明「只清 episodeUrl、刻意不清
vodRemarks」的理由,代码未动。
- docs/fix-playback-episode-selection-20261031.md 新增第 8 节,记录本轮双轴
评审结论、修复落点、不改项与残余风险。
验证:双 flavor 编译通过;leanback 定向单测 8 类 141 例、mobile 定向单测
8 类 340 例,全部 failures=0 errors=0(含合并带入的 LabEnv7zProgressTest 10 例)。
2026-11-01 18:13:48 +08:00
Silent1566
a75d9bd564
merge: 合并 origin/beta 391ff471d2 到 dev5(带入 lab 7z 解压进度)
2026-11-01 17:59:23 +08:00
Silent1566
80637501f9
merge: 合并 origin/beta 391ff471d2(PR #513 dev3 / 7z 原生解压进度)到 dev1
2026-11-01 10:58:36 +08:00
Silent1566
1b38053aa2
fix(lab): 7z 原生解压进度按字节上报
...
随包 7zz 的 -bsp1 只输出「当前文件百分比」,原实现没有解析它,7z 走原生路径时
UI 进度完全不动;直接把百分比当字节数上报又会让 formatSize() 显示荒谬数值。
- 新增 PercentScanner 解析 -bsp1 的 \r 原地刷新百分比行,只认行首 1~3 位 "NN%",
跨 read 边界保留状态,忽略文件名里的数字
- 新增 nativeBytes(percent, total) 把百分比折算成已解压字节:封顶 99%,100% 只留给
解压真正结束时补发;total<=0 时不上报,UI 退化为不确定进度而不是伪造进度
- 读 stdout 的循环在无回调用途下也始终排空,避免 7zz 因管道写满卡死
- extract7z 用 nativeTried 记录 7zz 是否已试过,避免失败后重复解压同一批文件
- 新增 LabEnv7zProgressTest(10 例)覆盖解析器与 nativeBytes 的契约
2026-11-01 10:26:58 +08:00
Silent1566
0d62df8f49
fix(progress): treat unknown duration as vod and fall back in duration text
...
Verification: compileMobileArm64_v8aDebugJavaWithJavac + compileLeanbackArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL 2m44s; testLeanbackArm64_v8aDebugUnitTest --tests com.fongmi.android.tv.player.engine.TimelineStreamKindPolicyTest BUILD SUCCESSFUL, XML tests=7 failures=0 errors=0
Task-Guard: AV-PROGRESS-03
2026-11-01 09:59:36 +08:00
Silent1566
50f38e36b8
merge: 合并 origin/beta e8c78ae8db 到 dev5(带入选集/倍速按键等已评审提交)
2026-11-01 09:42:02 +08:00
Silent1566
6e9a2b9de7
fix(progress): rebind leanback seek view after kernel rebuild
...
Verification: leanback: :app:testLeanbackArm64_v8aDebugUnitTest --tests VideoActivitySeekProgressSourceTest BUILD SUCCESSFUL; full leanback 4826 tests / 8 failed = 既有 CRLF+fontconfig+mpvHls 环境基线同名集合, 零新增; :app:compileMobileArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL
Task-Guard: AV-PROGRESS-02
2026-11-01 09:00:20 +08:00
Silent1566
2a0cc43fc7
fix(playback): keep detail/history episode selection in the player
...
Verification: compileLeanback+compileMobile OK; testLeanback 4834/8fail, testMobile 5599/6fail (all unrelated CRLF/media); in-scope classes 0 failures: PlaybackSelectionLocatorSourceTest 6, DetailPlaybackHandoffSourceTest 4, HistoryPlaybackTest 70, TmdbSeasonProgressStoreTest 8, GlobalHistoryResumeSourceTest 31, VideoActivityLayoutTest 157, TmdbUIAdapterTest 61, FlagSwitchPlaybackWiringTest 9, HistoryResumePayloadTest 5, VideoActivityHistoryTitleTest 4
Task-Guard: playback-episode-selection-fix-20261031
2026-11-01 03:24:24 +08:00
Silent1566
fec02b27de
fix(progress): fall back to history duration when engine reports none
...
Verification: compileMobileArm64_v8aDebugJavaWithJavac + compileLeanbackArm64_v8aDebugJavaWithJavac PASS; testMobileArm64_v8aDebugUnitTest --tests *VideoActivityLayoutTest* PASS; testLeanbackArm64_v8aDebugUnitTest --tests *PlayerControlFocusHelperSeekReturnTest* PASS
Task-Guard: AV-PROGRESS-01
2026-11-01 00:39:00 +08:00
Silent1566
27374dc6e7
docs(C115): 回填合并 origin/beta 9c695e9982 的交付坐标与按键链路交互复核
...
Verification: post-merge verification: :app:compileLeanbackArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL; SpeedAdjustKeyContractTest tests=4 failures=0; VideoActivityLayoutTest tests=157 failures=0; BUILD SUCCESSFUL in 2m 58s
Task-Guard: C115-beta-merge-followup-doc-20261031
2026-10-31 19:22:05 +08:00
Silent1566
5bcb9a3838
Merge remote-tracking branch 'origin/beta' into dev3
2026-10-31 18:53:05 +08:00
Silent1566
a2ffd76d45
docs(C115): 评审 dev3 倍速 UP 键修复 d1686cb44d 并回填交付坐标
...
Verification: SpeedAdjustKeyContractTest 4/4 pass (BUILD SUCCESSFUL in 34s); mutation removed VideoActivity.java:8840 -> 1 failed AssertionError at SpeedAdjustKeyContractTest.java:73; restored, worktree clean vs HEAD; review verdict PASS no blocking findings
Task-Guard: C115-beta-merge-review-dev3-20261031
2026-10-31 18:34:31 +08:00
Team Lead
cddb92832b
fix: end TV hold-speed only on the up-key release
...
Verification: compileLeanbackArm64_v8aDebugJavaWithJavac + compileMobileArm64_v8aDebugJavaWithJavac + testMobileArm64_v8aDebugUnitTest, BUILD SUCCESSFUL, VideoActivityLayoutTest tests=157 failures=0 errors=0
Task-Guard: C115-tv-speed-hold-residue-20261031
2026-10-31 17:39:18 +08:00
Silent1566
a5469c5cea
Merge pull request #506 from Silent1566/dev2
...
merge+review(C113): 合并远端 beta 77b302540d,修复手机全屏切口水平内缩并复评 leanback 进入播放卡顿优化
2026-10-31 13:59:20 +08:00
Silent1566
454b4aaaeb
Merge pull request #507 from Silent1566/dev5
...
fix(LIVE-LIST-SCRIM-UNIFORM): 直播列表遮盖层改为整块统一纯黑,滑块线性调节透明度
2026-10-31 13:59:10 +08:00
Silent1566
eb4ea6b492
docs(C114): 回填交付坐标(合并 a2d4a04faa / recovery tag / 推送 dev3 / PR #509 / 拉取最新)
...
Verification: docs-only closure: C114 task record backfilled with delivery coordinates (merge commit a2d4a04faa , recovery tag, push 5fc26a8990..a2d4a04faa, PR #509 OPEN with 37 files +1905 -88, fetch leaves 0/4 vs origin/beta); all values read from git/gh output
Task-Guard: C114-record-dev3-20261031
2026-10-31 12:43:16 +08:00
Silent1566
a2d4a04faa
merge: 合并 origin/beta 134bb29dc4 并完成 dev3 未推送代码评审, 主题槽位并集解冲突 + 2 项必修修复
...
Verification: merge origin/beta 134bb29dc4 into dev3; 4 union conflicts resolved in the theme package; 0 unmerged paths; 51 staged paths equal to beta's touched set; no beta path lost and no revert re-landed; review of 3 unpushed dev3 commits plus merged result in 4 rounds; 2 must-fix items fixed with mutation proof; dual-flavour compile BUILD SUCCESSFUL exit 0; theme unit tests 246/246 pass; full-suite failures identical to the origin/beta baseline; git diff --cached --check empty
Task-Guard: C114-beta-merge-review-dev3-20261031
2026-10-31 12:31:39 +08:00
Silent1566
707dc2a1c6
fix(LIVE-LIST-SCRIM-UNIFORM): align docs with the flat scrim and harden the fallback guards
...
Verification: gradlew --offline scrim tests (leanback+mobile): LiveListScrimTest 7/0/0, LiveListScrimWiringTest 8/0/0, LiveListScrimRenderTest 4/0/0 in both flavors; BUILD EXIT=1 only from 7 pre-existing Windows CRLF/renameTo baseline classes untouched by this diff; independent re-review PASS with no must-fix items and acceptance criteria 1-5 verified; working tree limited to the 4 declared paths
Task-Guard: LIVE-LIST-SCRIM-UNIFORM-REVIEW
2026-10-31 10:43:25 +08:00
Team Lead
7f4e148892
docs(C113): 合并 beta 77b302540d 后双轴评审记录(通过,零阻断)
...
Verification: compileLeanbackArm64_v8aDebugJavaWithJavac + compileMobileArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL; leanback 4765 tests 8 failed / mobile 5544 tests 6 failed, 全部为既有 CRLF 与 Windows renameTo 环境冤案(docs/C111-beta-merge-review-dev3-20261029.md:166 同集合零回归); 双轴只读评审通过无阻断
Task-Guard: C113-beta-merge-review-dev2
2026-10-31 10:10:49 +08:00
Team Lead
f9ebfec8d4
merge: 合并远端 beta 77b302540d 到 dev2(PR #502 dev1:leanback 进入播放主线程卡顿优化)
...
带入 23f51a7736 perf(leanback) + 380aad38da 合并修复 + 77b302540d PR #502 共 3 个提交,13 文件 +1412 -27:
leanback VideoActivity 启动预暖/跨帧分阶段、PlaybackConfigIdentity 缓存、App/Config/Device/Backup 新增性能开关字段、
DesktopLyricsWindow 与 PlaybackPerformanceSetting 调整、docs/C111 与 scripts/perf 四个脚本。
与本方 Following/History/PlaybackProgressWriter/mobile BaseActivity 改动无文本冲突(merge-tree --write-tree 退出码 0)。
2026-10-31 09:08:58 +08:00
Silent1566
0acd75b104
fix(LIVE-LIST-SCRIM-UNIFORM): TV live list scrim is one flat black instead of a left-to-right gradient
...
Verification: leanback+mobile unit tests: LiveListScrimTest 7/7, LiveListScrimWiringTest 8/8, LiveListScrimRenderTest 4/4 (Robolectric per-column alpha unset=0xCC, 1.00=0xFF, 0.20=0x33 across full width); assembleLeanbackArm64_v8aDebug exit=0; adb install emulator-5562 Success (device pixel sampling impossible: fresh install, empty tv.db, no live playlist)
Task-Guard: LIVE-LIST-SCRIM-UNIFORM
2026-10-31 02:40:46 +08:00
Silent1566
5daef84b85
merge(C113): 合入 origin/beta f7f6fc3c4d(PR #504 与 LIVE_LIST_SCRIM_OPACITY)
2026-10-30 19:38:05 +08:00
Silent1566
189c494ae9
docs(C112): 回填 PR #505 与 delivery 坐标
2026-10-30 19:35:15 +08:00
Silent1566
448d33d7a4
fix(home): 类型栏结构性写入统一走布局守卫,四轮评审修正双执行与孤儿写入
...
类型栏 mBinding.typeRecycler 在 RecyclerView 计算布局期间换 adapter 数据
(notifyDataSetChanged)会让子 View 拿不到 ViewHolder,dispatchLayoutStep1 崩溃。
- 新增 runTypeMutation(Runnable) 作为类型栏结构性写入的唯一入口:无返回值,
自己决定立即执行或入槽延后,调用方只允许裸语句调用,结构性杜绝“方法内执行一次
+ 调用方再执行一次”的双执行。
- 单槽合并 + 单 runner:「后写者覆盖」保证旧写入不盖新写入,「必执行」保证最新写入
不会因焦点失效被静默作废而留下永久空白的类型栏。
- 闭包内复查 isTypeLayoutBusy() 并在布局仍忙时重新 postOnAnimation,避免“下一帧必然
不在布局中”的错误前提。
- clearStaleSiteTypes 的隐藏与选中撤销留在同步段,只有 addAll 让路,换源后旧分类按钮
不会多活一帧。
- 新增 HomeTypeRecyclerLayoutGuardTest(8 项)钉住上述契约,并经变异检验证明可捕获回归。
- 新增任务文档 docs/C112-beta-merge-review-dev5-20261030.md。
验证:三变体编译 BUILD SUCCESSFUL;leanback 258 tests / 5 failed、mobile 577 tests /
3 failed,失败项与既有 CRLF 基线逐条一致,无新增。
2026-10-30 19:24:25 +08:00
Silent1566
248cdfe111
docs(C113): 回填交付坐标(合并 f6aea3c4b0 / recovery tag / 推送 dev4 / PR #504 / 拉取最新)
...
只追加已发生的实际事实,无代码改动、无再次构建:
- 评审提交 8a093c73638,recovery/C113-beta-merge-review-dev4-20261030/20261030-1240-8a093c73638
- 推送 dev4:553570b3a38..8a093c73638,exit 0
- PR #504(dev4 -> beta,OPEN,19 个文件)
- 拉取远端最新:fetch exit 0,pull --ff-only 为 Already up to date
- 终态:HEAD = origin/dev4;origin/beta 是 HEAD 祖先且落后 0(left-right = 0 / 4);工作区干净
2026-10-30 12:46:29 +08:00
Silent1566
8a093c7363
merge: 合并 origin/beta 66b40a1338 并完成 dev4 未推送代码评审(含 LIVE_LIST_SCRIM_OPACITY 必修项修复)
...
合并远端 beta 最新代码(8 个提交:#503/#502/#501 与追更静默失败修复、leanback 起播卡顿优化、
C111/C112/FOLLOW-3 文档和 scripts/perf 探测脚本),merge-tree 预检无冲突,零手工干预。
评审 origin/dev4..HEAD 中本机独有的两笔提交(bcdd344ec5c 功能 + d039c39f33 文档),
逐项核对槽位链路、默认值逐值一致性、只缩放 alpha 的色相约束、两个宿主的最小接线面,
发现并修复 1 项必修项:
F1 ThemeProfile 两处槽位计数注释失实。基线注释(17 槽 / 13 色 + 4 不透明度)在
PLAYER_CURRENT 由 c3bb6a63d9 加入后就已少算 1,本轮在陈旧数字上做加法(改写成 18 / 13+5),
与真实的 19 槽位 = 14 颜色 + 5 不透明度仍差 1。修正为 19 / 14 色 + 5 不透明度,
并按 ThemeEditor.Slot 常量(19)与 ThemeProfile.SlotSet 字段(14 String + 5 Float)逐项复算确认。
验证:双 flavour compile*JavaWithJavac 通过(修复前 9m52s / 修复后 41s,均 exit 0);
theme 包单测修复后重跑,leanback 32 类 224 例、mobile 26 类 208 例,合计 432 例
0 失败 0 错误 0 跳过;git diff --check 空。
限制:本机 bash 通道不可用(HCS_E_SERVICE_NOT_AVAILABLE),task_guard.sh 无法启动,
沿用 C105/C108/C111 的等效手工流程(只暂存任务自有路径 + 手工 recovery tag)。
2026-10-30 12:39:46 +08:00
Silent1566
f6aea3c4b0
Merge remote-tracking branch 'origin/beta' into dev4
2026-10-30 11:15:47 +08:00
Silent1566
d039c39f33
docs(theme): 记录 LIVE_LIST_SCRIM_OPACITY 的 emulator-5560 真机验证证据
...
Verification: emulator-5560 (Android 9, HD1910): leanback APK 204991032 bytes matches HEAD bcdd344ec5 build; drawer scrim pixel-sampled at y=30: liveListScrimOpacity=1.0 -> alpha 1.000/0.624/0.113, null -> 0.797/0.496/0.083 (matches shape_live_list black_80 0xCC=0.800), 0.5 -> 0.504/0.308/0.053; theme editor slider theme-opacity:LIVE_LIST_SCRIM_OPACITY visible and writable 100%->68% with dirty flag; mobile APK embedded branch unchanged (no scrim, rounded cards); device restored: leanback reinstalled, profileEqual=True, wm size reset, user_rotation 0, temp files removed
Task-Guard: LIVE-LIST-SCRIM-DEVICE-VERIFY
2026-10-30 10:55:23 +08:00
Silent1566
66b40a1338
Merge pull request #503 from Silent1566/dev2
...
merge+fix(following): 合并远端 beta ba802dc432 并修复追更检查静默失败与季号未知进度停更
2026-10-30 09:18:33 +08:00
Team Lead
15cf4ee1e2
merge+fix(following): 合并远端 beta ba802dc432 并修复追更检查静默失败与季号未知进度停更
...
合并:origin/beta ba802dc432(PR #498/#499/#500/#501,25 提交 45 文件)无冲突合入 dev2,形成合并提交 3639181e3e 。
评审:四轴并行——合并语义冲突核对(结论无冲突无回归)、FOLLOW-3 设计稿事实核对(发现 3 处事实错误)、Spec 轴三轮(第 3 轮通过,无阻塞项)、Standards 轴协调者自审。
修复内容:
1) 季号未知(-1)导致追更集数进度永久停更:FollowingStore 新增 resolveSeason/seasonMatches 两个纯函数,projectHistory 增加带 trackedSeason 提示的重载,两处 DAO 季号查询与 watchedSeason/trackedSeason 写入统一改用 resolveSeason,reconcile 与 historyFor 的季号过滤放行未知季;不新增 Room 字段、不改 DAO 查询、无迁移。
2) 检查失败被静默:探针跑通但零可播集数现判为检查失败;item.lastError 成为失败唯一真源,卡片(FollowingAdapter)、详情弹窗与 FILTER_FAILED(FollowingActivity)三处统一走 sourceCheckFailed,去掉会误判的 lastProbeAt 判据(Alist 订阅导入会预写该字段)。
3) 检查失败时补跑进度 reconcile:在失败早退分支按 update → reconcile → scheduleNext 顺序补 FollowingStore.reconcile(item),避免探不到可播集的源进度永不重建。
4) FollowingUpdateWorker 的两个 catch 补 Log.w/Log.e,异常不再完全无声。
5) 用户可见失败文案提为 TMDB_DEGRADED / SOURCE_FAILED 常量,对外字面值不变。
6) FOLLOW-3 设计稿修正 tmdbId 来源数量(6 处写入路径)、resolveTmdb 返回语义(墓碑返回该行本身,失败判据为 migrated == null || isDeleted())、copy() 行号等事实错误,并把基线重标到 3639181e3e 。
测试:新增 FollowingSeasonProjectionTest(10)、FollowingFailureSnapshotContractTest(4)、FollowingFailureReconcileContractTest(3),FollowingUpdateCoordinatorErrorTest 扩到 9 例;FollowingUpdateCoordinatorDeviceTest 追加失败分支仪器用例,失败后用 Room 读回断言 playable*/officialStatus 未变、failureCount/lastError/nextCheckAt 已记账,并断言探针确实执行。
Verification: 合并:3639181e3e 双亲=efdf8be13e+ba802dc432,rev-list --count HEAD..origin/beta=0,merge-tree 预判无冲突;编译:leanback 与 mobile 变体 compile*JavaWithJavac 均 BUILD SUCCESSFUL(2m22s / 1m50s);单测:双变体 following 包 12 类 + FollowingUiSourceTest 15 + HistoryPlaybackTest 66 + PlaybackProgressWriterEpisodeTest 15 + HistoryScopeSyncTest 7 全部 failures=0 errors=0,新增 3 个测试类 10/4/3 与 CoordinatorErrorTest 9 全绿;合并语义契约:HistorySeasonDeleteScopeTest 1 + HistoryScopeSyncTest 7 + VodApiTest 39 零失败;仪器测试:emulator-5556 上 assemble + adb install -r + am instrument,FollowingUpdateCoordinatorDeviceTest OK (2 tests)、FollowingProjectionDeviceTest OK (1 test),未使用 connectedAndroidTest;评审:Spec 轴第 3 轮通过无阻塞项
Task-Guard: C112-beta-merge-review-dev2-20261029
2026-10-30 01:11:12 +08:00
Silent1566
bcdd344ec5
feat(theme): 直播列表遮盖层可配置(LIVE_LIST_SCRIM_OPACITY),默认与现状逐值一致
...
Verification: dual-flavour compile BUILD SUCCESSFUL (compileLeanbackArm64_v8aDebugJavaWithJavac + compileMobileArm64_v8aDebugJavaWithJavac); testMobileArm64_v8aDebugUnitTest com.fongmi.android.tv.theme.* all green (LiveListScrimTest 7/0/0, LiveListScrimWiringTest 7/0/0, ThemeEditorContractTest 13/0/0, ThemeProfileCodecTest 10/0/0, ThemeProfileValidatorTest 11/0/0, ThemePresetsTest 9/0/0, PlaybackMenuScrimTest 5/0/0, ThemeBinderContractTest 26/0/0) plus SettingPlaybackOverlayTest 3/0/0; testLeanbackArm64_v8aDebugUnitTest theme suites green incl ThemeEditorPanelTest 2/0/0 with new LIVE_LIST_SCRIM_OPACITY slider at progress 75; only failures are pre-existing environment ones MpvFontConfigTest + MpvHlsCacheCoordinatorTest already recorded in docs/C108-beta-merge-review-dev4-20261028.md; gradientColors re-derived 0.80 -> 0xCC000000/0x66000000/0x0D000000 equal to black_80/black_40/black_05, 1.00 -> 0xFF/0x80/0x10, 0.20 -> 0x33/0x1A/0x03
Task-Guard: LIVE-LIST-SCRIM-OPACITY-20261029
2026-10-30 00:28:18 +08:00
Silent1566
380aad38da
merge(C111-dev1): 合并 origin/beta ba802dc432 并修复评审发现的 5 处问题
...
合并 origin/beta ba802dc432(PR #500 from dev5,19 个提交 / 41 个文件)。唯一冲突 Config.java:insert()/save()/delete() 同时保留 PlaybackConfigIdentity.invalidateAll() 与 beta 新增的 invalidateCatalog()。
评审发现并修复:
1) 适配器时序窗口:setViewModel() 同步注册 observeForever,而 mFlagAdapter 只在 initView stage 1 创建;Activity 重建且 ViewModel 保留时 Result 会早到并解引用未建适配器。setDetail(Result) 闸改为 service()==null||mFlagAdapter==null,setPlayer(Result) 改为 service()==null||mQualityAdapter==null,并让 onServiceConnected 尾段在队列非空时排成 4-service-results 阶段。
2) 阶段安全网只生效一次:改为 armInitViewStageSafetyNet() 按队列非空自续期,新增 INIT_VIEW_STAGE_STALL_TIMEOUT_MS=1000 与 mInitViewLastPumpAt 判停摆,避免慢首帧时安全网变成第二个更慢的推进源;删除失效字段 mInitViewStagesPumped。
3) 迟到 stage 无人泵:deferInitViewStage() 在已 launch 时重新武装安全网,堵住 teardown 期间 service 恰好连上导致 4-service-results 永不推进的窄口。
4) 关闭媒体徽标仍预热 127 条正则:App.warmMediaBadgePatterns() 先判 PlayerSetting.isDisplayMediaBadges()。
5) Backup 绕过 Config 写路径使播放身份缓存陈旧:restore(boolean) 与 restore(SyncOptions,boolean) 补 PlaybackConfigIdentity.invalidateAll()。
文档:docs/C111-leanback-playback-loading-jank.md 新增 §14(合并事实、为何不复用旧评审、三轮评审结论、5 项修复与复验)。
Verification: compileLeanbackArmeabi_v7aDebugJavaWithJavac + compileMobileArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL; testLeanbackArmeabi_v7aDebugUnitTest 4732 tests/8 failed and testMobileArmeabi_v7aDebugUnitTest 5514 tests/6 failed, all failures are pre-existing CRLF-checkout source-scan failures (docs/HOME-STATE-NO-CONFIG-20261018.md:131) unrelated to this diff; 4 rounds of independent read-only review passed (a55494fc, d371dd9c, ecea6948 all approved)
Task-Guard: C111-beta-merge-review-dev1-20261029
2026-10-29 22:54:43 +08:00
Team Lead
3639181e3e
merge: 合并远端 beta ba802dc432(PR #498 dev1 / #499 dev4 / #500 dev5 / #501 dev3)到 dev2
2026-10-29 15:49:54 +08:00
Team Lead
efdf8be13e
docs(following): 新增 FOLLOW-3 追更 TMDB 匹配设计(手动匹配 + 严格自动兜底)
...
Verification: 文档交付:docs/FOLLOW-3-tmdb-following-match-design.md(632 行)已完成并逐条核对既有 API 签名(TmdbSearchDialog/ChoiceDialog/TmdbMatcher/TmdbService/TmdbMatchCache/FollowingStore.resolveTmdb/FollowingMetadataClient/FollowingUpdatePolicy 逐行核对);本文为设计稿,未修改任何代码。
Task-Guard: FOLLOW-3-TMDB-MATCH-20261029
2026-10-29 15:18:49 +08:00
Silent1566
23f51a7736
perf(leanback): cut playback-enter main-thread stalls (prewarm, cross-frame stages, prefs/identity caches)
...
Verification: Final tree (:app:compileLeanbackArmeabi_v7aDebugJavaWithJavac --offline) BUILD SUCCESSFUL in 15s exit 0; six reviewed changes F1/F3 leanback initView cross-frame stages + fast-path spinner dedupe, F2 Device identity prewarm, F4 badge regex prewarm, F5 overlay binder short-circuit, F7 PlaybackConfigIdentity cache with write-path invalidation, F8 prefs single-value read replacing 114KB getAll copy; device evidence emulator-5554 (arm32 via libnb) same-probe: window fps 45.3->79.3 was retracted as framestats truncation artifact, paired A/B baseline vs f8-full 3 pairs shows no measurable gain and is confounded by +44ms/min tap->START drift; documented in docs/C111-leanback-playback-loading-jank.md sections 1-13 with rollback points per item; no startup regression, no first-frame black screen
Task-Guard: C111
2026-10-29 14:55:20 +08:00
Silent1566
ba802dc432
Merge pull request #500 from Silent1566/dev5
...
修复 configKey 桥接侵入激活配置的问题,并合并 beta 最新代码
2026-10-29 08:14:21 +08:00
Silent1566
d80afbf9b8
Merge pull request #501 from Silent1566/dev3
...
合并 dev3 到 beta:OSD 媒体徽标只全屏显示 + C111 合并评审修正
2026-10-29 08:14:10 +08:00
Silent1566
5fc26a8990
docs(C111): 记录 dev3 合并 beta aab55dfcca 的评审、7 项必修修复、验证与交付坐标
...
Verification: docs-only closure commit: C111 task record written from verified evidence (merge 0 conflicts, 6 review rounds, 7 must-fix items, dual-flavour compile BUILD SUCCESSFUL, PlayerDisplaySettingSyncTest 14/14 both flavours, ControlDialogOsdSettingsTest 9/9, full-suite failures identical to origin/beta baseline, PR #501 created, remote fetched)
Task-Guard: C111-record-dev3-20261029
2026-10-29 07:39:04 +08:00
Silent1566
50e68ac9d6
merge: 合并 origin/beta aab55dfc 并修正 OSD 媒体徽标评审问题
...
- 合并 origin/beta aab55dfcca94904a4ca6b7775b4f57bda343e35c(53 个提交、69 个文件),0 冲突
- 存量用户升级回归:新增 Prefers.contains(String),PlayerSetting 增加 migrateMediaBadgePersist(),旧键 player_osd_media_badges 只在 persist 键缺失时抄写一次
- 控制栏布局监听泄漏:PlayerOsdController 新增 observedControlBarListener 字段与 stopObservingControlBar(),release() 中反注册
- 详情页内嵌播放器控制栏高度:controlBarTopInset 增加 bottom -> playerBottom -> bar.getHeight() 三级回退,controlBar() 增加 detailControlHost / playerControls 候选与 firstVisible 挑选
- applyMediaBadgePosition() 首行补 mediaBadges 判空
- 屏显第 8 位补回「总开关 AND 常驻开关」的与关系(PlayerSetting.getDisplayChecked)
- 手机直播补 isFullscreen() 覆写并排除画中画小窗;电视端直播恒全屏不覆写
- 单测 PlayerDisplaySettingSyncTest 增至 14 例(含变异验证),docs/osd-media-badges.md 同步第十二轮
验证:双口味编译 BUILD SUCCESSFUL;PlayerDisplaySettingSyncTest mobile/leanback 各 14 例 0 失败;ControlDialogOsdSettingsTest 9 例 0 失败;全量双口味单测失败项与 origin/beta 基线逐一同名(零回归)。
Verification: 双口味编译 BUILD SUCCESSFUL;PlayerDisplaySettingSyncTest mobile/leanback 各 14 例 0 失败;ControlDialogOsdSettingsTest 9 例 0 失败;全量双口味单测(mobile 5489 / leanback 4708)失败项与 origin/beta 基线逐一同名,零回归
Task-Guard: C111-beta-merge-review-dev3-20261029
2026-10-29 07:29:01 +08:00
Silent1566
40bb057562
fix(gateway): make configKey bridging non-invasive and fail closed
...
- VodSiteCatalog: read-only configKey resolution (exact interfaceKey, then PlaybackConfigIdentity.cidForKey) that never inserts a config row; 60s TTL cache invalidated on Config insert/save/delete; timestamps sampled after parsing; bridged catalogs also merge Site.findAll and CustomCspSetting so they match native loading
- CatSource/NodeRuntime: refuse to serve a cat-source bundle that the running node runtime is not already serving, instead of stopping the node of the active config; isServing now requires matching url, running, port>0 and a live service
- BaseLoader/JsLoader/PyLoader/JarLoader: give the spider caches a (namespace, siteKey) slot so bridged sites cannot overwrite the same-key spider of the active config; the ?do=js and ?do=py recent keys use the same slot key
- BaseLoader.proxy: when configKey is present, never fall back to the active config; raise a distinguishable error instead of serving the wrong source
- Site: carry a transient, @Ignore runtime namespace so Site.spider() routes to the right slot
- History/Action: scoped history push writes to the cid of the target config via History.syncTo(cid, ...) without switching the active source
- VodApi: /vod/api?ac=config and site requests accept configKey, emit configKey into proxied urls and into the generated site list
- tests: VodApiTest, HistoryScopeSyncTest, LoaderNamespaceSlotTest, LoaderRecentNamespaceTest, NodeRuntimeServingTest (55 cases)
- docs: add docs/C109-beta-merge-review-dev5-20261028.md recording the 2 reviewed commits, the B1-B4/M1-M4 fixes, the remaining known risks (M5 unauthenticated LAN gateway, ?do=js/?do=py and js2Proxy not closed for bridged configs) and the rollback path
Verification: compileLeanbackArm64_v8aDebugJavaWithJavac + compileMobileArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL in 53s; targeted VodApiTest 39 + HistoryScopeSyncTest 7 + LoaderNamespaceSlotTest 3 + NodeRuntimeServingTest 2 + LoaderRecentNamespaceTest 4 = 55 tests 0 failures; full testLeanbackArm64_v8aDebugUnitTest = 4725 tests / 8 failed / 0 errors / 3 skipped, all 8 identical to the pre-existing baseline (Windows renameTo + CRLF), 0 new failures; 5 review rounds until pass
Task-Guard: c109-configkey-bridge-hardening
2026-10-29 05:53:13 +08:00
Silent1566
553570b3a3
docs(C111): 回填 recovery tag 与 PR #499 交付坐标
2026-10-29 01:17:28 +08:00
Silent1566
aa8f8a06f3
fix(mobile-live): PiP 窗口释放状态栏占位并补回归断言(C111 评审 F1)
...
评审 7965b6fd87 时发现:onPictureInPictureModeChanged 只调 setVideoView/hideUI,
从不重算状态栏占位;而 isEmbeddedLiveUi() 在 PiP 中为 false,占位本应释放为 0。
原先依赖「进入 PiP 会派发 configuration change → onConfigurationChanged → updateSystemUI」
这条系统时序兜底;一旦未及时派发,嵌入式高度会保留,而 setVideoView 已把 video 强制为
MATCH_PARENT/weight=0,画面就被占位带向下挤。
修复:在 setVideoView(...) 之后直接调用 applyStatusBarInset(),让不变量落在模式变化点自身。
该方法是幂等的(高度未变即 return,statusBar 为 null 时直接返回),进出 PiP 两条分支都经过,
不改动嵌入式/全屏既有路径。
回归断言:LiveActivityLayoutTest.mobilePortraitLivePlayerReservesTheStatusBarArea 增加
pipBody.contains("applyStatusBarInset();"),删除该行即测试变红(已机械验证)。
验证::app:compileMobileArm64_v8aDebugJavaWithJavac 与
:app:compileLeanbackArm64_v8aDebugJavaWithJavac 成功;
testMobileArm64_v8aDebugUnitTest 5485 例 / 2 失败 / 3 跳过;
testLeanbackArm64_v8aDebugUnitTest 4703 例 / 2 失败 / 3 跳过;
LiveActivityLayoutTest 19 例 0 失败。失败项与 C106/C108 基线逐条一致(MpvFontConfigTest、
MpvHlsCacheCoordinatorTest,均为沙箱环境失败,未在本次 diff 内)→ 零回归。
独立只读复评该 diff:VERDICT PASS。
Task-Guard: C111-beta-merge-review-dev4 (本机 bash 通道不可用,手工等效流程)
2026-10-29 01:13:07 +08:00