0
Fork 0
mirror of https://github.com/Silent1566/webhtv.git synced 2026-11-17 18:56:13 +00:00
Commit graph

5,126 commits

Author SHA1 Message Date
Silent1566
2a911a9e18 docs(AV-PROGRESS-04): 修正行号并记录合并 beta 后的独立复评结论 recovery/AV-PROGRESS-04-docfix/20261103171550-2a911a9e18af
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
f4cd37789a Merge remote-tracking branch 'origin/beta' into dev5 2026-11-03 23:47:21 +08:00
Silent1566
28d3ed286f fix(progress): rebind leanback inline seek view after kernel rebuild recovery/AV-PROGRESS-04/20261103230734-28d3ed286fbb
电视端「打开历史播放」落到 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
03958c154d
Merge pull request #518 from Silent1566/dev5
fix(tv): 修复选集网格长按只走一格与松手闪回
2026-11-03 12:43:23 +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
5b24c6cfc4 Merge remote-tracking branch 'origin/beta' into dev5 2026-11-03 10:04:04 +08:00
Silent1566
954527e69e
Merge pull request #517 from Silent1566/dev1
fix(tv): 修复点播内联分类页隐藏工具条的两处缺陷(回首页工具条不恢复、分类页顶部留白 dp 当 px)
2026-11-03 09:39:08 +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
745365b8b6 fix(tv): keep the home toolbar restore scoped to the category mode recovery/HOME-CATEGORY-TOOLBAR-20261102/20261102-161925Z
跟进 6bb5560b1e(点播内联分类页隐藏首页工具条)的两处缺陷,均由代码评审发现:

1. 分类页里滚动隐藏的状态会泄漏回首页(功能性)
   CustomVerticalGridView#setHeaderVisibility 会把 getScrollHeaderIds() 给出的
   typeRecycler 和 toolbar 一起藏掉,并同步回调 HomeActivity#onScrollHeaderVisibilityChanged
   -> updateToolbarVisibility(false),把 toolbarRequestedVisible 固化为 false。
   于是在分类页往下滚过再按返回,showHomeContent() 里的 applyToolbarVisibility()
   仍然算出 show=false,首页的 logo / 站点名 / 时钟工具条不再恢复。
   现在 showHomeContent() 与 clearCategoryContent() 在 applyToolbarVisibility() 之前
   把 toolbarRequestedVisible 复位成 true:滚动驱动的隐藏只是分类页的临时状态,
   不跨越内容模式;复位的是 toolbarRequestedVisible 而不是 webToolbarVisible,
   否则会破坏 TV_FULL / TV_TOOLBAR_HIDDEN 这两个 web 全屏模式。

2. 分类页的顶部留白把 dp 当成 px 用(视觉)
   syncNativeContentInset() 里 ResUtil.dpOf(R.dimen.webhtv_space_6) 返回的是 dp,
   而同一三元表达式的另一臂 toolbarHeight() 是 px,结果直接进 View.setPadding(px)。
   1080p(density 2.0)电视上分类行只得到 24px = 12dp,而本功能要对齐的
   VodActivity 分类页(activity_vod.xml)是 24dp,错位依旧存在。
   改用 getResources().getDimensionPixelSize(...),取活动自身(已按 UI 缩放包裹)
   的资源,而不是 App.get() 的密度。缓存命中处不变:三条臂现在都是 px,
   getPaddingTop() == top 的提前返回比较的也是 px。

分类行相对 VodActivity 仍有 4dp 留白差(nativeContent 24dp + typeRecycler
paddingTop 4dp = 28dp):属可接受的外观差异,不再耦合另一个 View 的 padding 去消除。

测试:HomeCategoryNavigationSourceTest#inlineCategoryPagesHideTheHomeToolbarButKeepTheTypeRow
新增两条顺序断言(复位必须早于 applyToolbarVisibility),并把原来的
"inset.contains(webhtv_space_6)" 改成断言 getDimensionPixelSize 且排除 dpOf。

验证:
- :app:compileLeanbackArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL
- :app:testMobileArm64_v8aDebugUnitTest --tests HomeCategoryNavigationSourceTest
  tests=14 failures=0 errors=0
- 两轮独立只读评审:第二轮 APPROVE WITH NITS,无遗留缺陷;
  applyTvChrome -> updateToolbarVisibility 覆盖首页滚动隐藏一事为 beta 既有行为,
  不属本次改动,未在此修。

Task-Guard: HOME-CATEGORY-TOOLBAR-20261102
2026-11-03 00:18:16 +08:00
Silent1566
6bb5560b1e fix(tv): hide the home toolbar band on inline category pages
Verification: emulator-5554 leanback arm64 debug: D-pad 电影 category page hides MO logo/site name/clock toolbar while keeping the 首页/电影/... type row (v2.png), returning to 首页 restores the toolbar (v3.png); :app:testMobileArm64_v8aDebugUnitTest --tests HomeCategoryNavigationSourceTest --tests TouchOptimizationHelperSourceTest => BUILD SUCCESSFUL, 14+11 tests 0 failures

Task-Guard: HOME-CATEGORY-TOOLBAR-20261102
2026-11-02 12:27:45 +08:00
Silent1566
53989159df
Merge pull request #515 from Silent1566/dev5 v5.6.0-beta-202611021003
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
39f69e5ee6 Merge remote-tracking branch 'origin/beta' into dev5 2026-11-02 00:36:42 +08:00
Silent1566
dabfbcd2b6 fix(episode): 剥离粘连画质标记修复集数解析错误
Verification: gradlew :app:testMobileArm64_v8aDebugUnitTest --tests '*UtilTest*' BUILD SUCCESSFUL; UtilTest 11 tests, 0 failures, includes new getNumber_stripsGluedQualityTokens

Task-Guard: ep-number-glued-quality
2026-11-01 23:51:05 +08:00
Silent1566
b450abc11f
Merge pull request #514 from Silent1566/dev5
fix(playback): 修复详情页/历史页选集身份在播放页丢失
2026-11-01 18:25:03 +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
391ff471d2
Merge pull request #513 from Silent1566/dev3
fix(lab): 7z 原生解压进度按字节上报
2026-11-01 10:39:29 +08:00
Silent1566
1b38053aa2 fix(lab): 7z 原生解压进度按字节上报 recovery/C116-lab-7z-native-progress-dev3-20261101/20261101102600
随包 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
e8c78ae8db
Merge pull request #511 from Silent1566/dev3 v5.6.0-beta-202610311930
fix(leanback): 修复 TV 端倍速按钮 UP 键被焦点助手吞掉(dispatchSpeedAdjust)
2026-10-31 19:30:15 +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
Silent1566
9c695e9982
Merge pull request #510 from Silent1566/dev2
fix: TV 长按倍速松手不再误弹播放菜单(并修掉暂停态与连击残留)
2026-10-31 17:48:25 +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
Team Lead
7174df9457 fix: keep TV hold-speed release from opening the playback menu
Verification: app:testMobileArm64_v8aDebugUnitTest --tests *VideoActivityLayoutTest* -> BUILD SUCCESSFUL, 157 tests, 0 failures; :app:compileLeanbackArm64_v8aDebugJavaWithJavac -> BUILD SUCCESSFUL

Task-Guard: tv-speed-hold-no-menu
2026-10-31 16:05:55 +08:00
Silent1566
d1686cb44d Fix TV speed adjustment UP key being swallowed by control focus helper
Verification: SpeedAdjustKeyContractTest 4/4 pass on testLeanbackArm64_v8aDebugUnitTest; mutation check wrapping the call in false && dispatchSpeedAdjust(event) fails the dispatch-order assertion; full suite 4823 tests shows only the same 8 pre-existing baseline failures that reproduce on clean HEAD (none in VideoActivity)

Task-Guard: TV-SPEED-KEY-ADJUST-01
2026-10-31 15:35:09 +08:00
Silent1566
a5469c5cea
Merge pull request #506 from Silent1566/dev2 v5.6.0-beta-202610311359
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
9d8ea553da
Merge pull request #509 from Silent1566/dev3
merge+review(C114): 合并 beta 134bb29dc4 到 dev3,主题槽位并集解冲突并修复 2 项必修
2026-10-31 13:58:57 +08:00
Silent1566
eb4ea6b492 docs(C114): 回填交付坐标(合并 a2d4a04faa / recovery tag / 推送 dev3 / PR #509 / 拉取最新) recovery/C114-record-dev3-20261031/20261031044316-eb4ea6b4926f
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 项必修修复 recovery/C114-beta-merge-review-dev3-20261031/20261031043140-a2d4a04faa62
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
21c10db4a1 Merge remote-tracking branch 'origin/beta' into dev5 2026-10-31 08:57:34 +08:00
Team Lead
086a25cc25 fix(mobile): stop horizontal cutout padding from absorbing top/bottom insets
Verification: gradle assembleMobileArm64_v8aDebug succeeded after the edit (app-mobile-arm64_v8a-debug.apk 208731520 B written 03:32:20, BaseActivity.java 03:03:41) and the APK installed and launched on emulator-5556 without crash. Cutout padding now derives only from safeInsetLeft/safeInsetRight. Visual confirmation on API 29+ remains outstanding because every local AVD reports ro.build.version.sdk=28, below the VERSION_CODES.Q early return.

Task-Guard: fullscreen-control-cutout-inset
2026-10-31 05:17:54 +08:00
Silent1566
dccfa6b79b Let the item overlay slots drive selected text and the rest tier
Verification: Selected text colour and the rest tier now really drive the UI. ThemeBinder gained overlayText propagation: it is computed in bind() and only passed down when active.colorOnItemOverlay() differs from the baseline, so a profile that changes unrelated slots cannot recolour item text (night table onItemOverlay is #062E6F while item hosts actually paint on_wallpaper #FFFFFF). bindText rewrites focused/selected states of item-host text through sitsOnItemOverlay, which accepts the host itself or a background-less direct child of a host - the actual shape of adapter_func, activity_setting and activity_search - and which reuses the item-overlay fill whitelist rather than the shared black_40 colour, so keyboard key beds, the card band and glass panels keep their text. The normal-state bases (shape_item_normal, shape_item_round_normal, shape_search_hot_word_normal) now follow the overlay token at half strength via ITEM_OVERLAY_REST_FILLS and overlayFillColor; default 0x66 halved is bit-for-bit 0x33 = @color/black_20, so the default appearance is unchanged while the focused/rest hierarchy survives. Verified independently: theme package 31 suites / 225 tests / 0 failures (was 221, four new cases: onItemOverlaySlotDrivesTheItemHostText, itemHostTextStaysCompiledWhenOnlyOtherSlotsChange, overlayTextIsNotWrittenOnExcludedHosts, restTierHalvesTheOverlayTokenIntoTheCompiledNormalFill); activity suite 250 tests with the same 5 pre-existing failures and no new ones; compileLeanbackArm64_v8aDebugJavaWithJavac and compileMobileArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL; no dangling references to the replaced boolean isItemOverlayFill.

Task-Guard: TV-THEME-OVERLAY-TEXT
2026-10-31 02:42:57 +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
d9ea5e4976 Make the TV show-item overlay and selected text themeable
Verification: Item overlay theme slots: ThemeProfile/ThemeTokens gained colorItemOverlay, colorOnItemOverlay and itemOverlayOpacity. Theme.WebHTV assigns webhtvColorItemOverlay/webhtvColorOnItemOverlay to the compiled tokens. Seven leanback show-item shapes now fill from the item overlay attr; normal states keep black_20 so the default look stays byte-identical. ThemeBinder gained an independent name whitelist (ITEM_OVERLAY_FILLS plus ITEM_OVERLAY_PARENTS) reusing the existing signature+pixel-fingerprint identity model instead of a colour reverse lookup, because black_40 is shared by 28 drawables including the keyboard key bed, the card band and the glass panels. Editor exposes the three slots with three-locale labels. Verified independently: theme package 31 suites / 221 tests / 0 failures (baseline 213, plus 8 new ThemeBinderItemOverlayTest cases including defaultProfileLeavesTheItemHostAtTheCompiledOverlay strict no-op and overlayExcludedDrawablesAreNotRewritten). Full leanback suite 4748 tests with 8 failures, every one pre-existing and in files this session never modified: CRLF-literal assertions (VideoActivity, reader.html, eclipse.html, WebThemeTokenSourceTest) and two Windows-filesystem mpv tests (MpvFontConfigTest IOException, MpvHlsCacheCoordinatorTest). TvSearchSurfaceContractTest was retargeted from the black_40 literal to the invariant it protects (slot wired, token still 66000000, attr assigned) and was not weakened.

Task-Guard: TV-THEME-ITEM-OVERLAY
2026-10-30 20:33:34 +08:00
Silent1566
134bb29dc4
Merge pull request #505 from Silent1566/dev5 v5.6.0-beta-202610301950
dev5 -> beta:合并远端 beta 最新代码并修复首页类型栏布局崩溃(四轮评审)
2026-10-30 19:50:38 +08:00
Silent1566
5daef84b85 merge(C113): 合入 origin/beta f7f6fc3c4d(PR #504 与 LIVE_LIST_SCRIM_OPACITY) 2026-10-30 19:38:05 +08:00