dong/webhtv-mys
0
Fork 0
mirror of https://github.com/Silent1566/webhtv.git synced 2026-10-18 07:09:16 +00:00
Code Issues Releases Packages Activity

merge: 合并 origin/beta 最新代码（PR#411）并复评修复播放加载圈守卫泄漏

Browse source 
- 合并 origin/beta tip 9b168a1f38（PR#411），0 冲突；远端 18 个回退提交移除内容零复活
- 复评 dev2 未推送提交 f77c4a0236 时发现真实缺陷：setPlayer 的重复结果早退分支
  未释放 mPlaybackRequestActive，导致 onStateChanged 与 hidePlaybackProgressIfStale
  两个收圈路径同时被挡下，加载圈在「同一结果已在播」时永不清除；改为在该分支内释放守卫
- 同步订正 ReaderPlaybackRoutingSourceTest 中被钉死的单行写法为语义断言，保留「重复结果不得重复起播」口径
- 双 flavor Java/androidTest 编译通过；双端全量 JVM 套件相对合并前基线零新增回归

Verification: :app:compile{Leanback,Mobile}Arm64_v8aDebugJavaWithJavac and :app:compile{Leanback,Mobile}Arm64_v8aDebugAndroidTestJavaWithJavac BUILD SUCCESSFUL; :app:testMobileArm64_v8aDebugUnitTest 5200 tests/6 failed and :app:testLeanbackArm64_v8aDebugUnitTest 4351 tests/7 failed, both failure sets identical to the pre-merge baseline worktree @ f77c4a0236 (mobile 5195/6, leanback 4349/7) => zero new regressions (CRLF-only multi-line source assertions + one load-sensitive flake, all target files byte-identical to origin/beta); 18 beta revert commits x 48 file-versions x 795 removed lines => 0 resurrected; 6 merged paths byte-identical to origin/beta, 2 dev2 paths preserved; merge tree 8d0126b93e == git merge-tree prediction; fix falsification: reverting the duplicate-result guard branch => VideoActivityLayoutTest 154 tests/1 failed (leanbackPlaybackLoadingIgnoresStaleReadyBeforeNewPlayerStarts), and deleting the mobile guard => reclaimedOrRepeatedPlayerResultsAreNotStartedTwice FAILED; check_ui_tokens.sh --strict violations=1 legacy=0 (pre-existing mobile/item_following.xml, zero new) and UI_TOKEN_CONTRAST pairs=38 failures=0; git diff --check clean

Task-Guard: C42-beta-merge-review-dev2
This commit is contained in:
Silent1566 2026-10-07 10:50:03 +08:00
commit 3374def641
10 changed files with 905 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files