0
Fork 0
mirror of https://github.com/Silent1566/webhtv.git synced 2026-10-18 07:09:16 +00:00

merge: 合并 origin/beta 最新代码(PR#445/#446)并复评修正 dev2 已提交未推送的手机全屏手动旋转改动

合并 origin/beta tip 870b2f8220(dev2 已被合入 beta 的双父合并提交):
0 冲突,合并树与 beta 树逐字节中性,零新增/零丢失,零复活(含可证伪自检)。

复评 dev2 已提交未推送的 4f75fbe451(手机全屏手动旋转方向在切集后保持):
- 实现正确:manualRotate 在 onRotate() 置位、checkOrientation() 让位、
  进出全屏按当前视频形态重建自动基线并清除标记,三条不变量均有断言锁定。
- 发现 1 项必修:PlayerPlaybackRegressionSourceTest 的跨行字面量断言在
  CRLF 工作区恒假——既让 livePlaybackAlwaysAutoplaysWhileVodUsesTheConfiguredPolicy
  直接失败,又使 assertAlwaysAutoplay 对 mobile/leanback LiveActivity 的
  回归锁实际零保护。read() 归一化行尾后修复,与同包既有写法一致。
- 三项变异验证证明修复后断言非空转,探针均已还原。

Verification: PlayerPlaybackRegressionSourceTest 15/15 + SiteDialogLayoutTest 4/4;
双 flavor Java 编译通过;git diff --check 干净;gradlew clean 成功。
Task-Guard: C71-beta-merge-review-dev2-20261015

Verification: merge origin/beta (870b2f8220) into dev2: 0 conflicts, merge tree f01ec5c437fdb8f05f64dd2c69d1b4d3956b24b0 byte-identical to beta tree except dev2 own 2 paths; zero-loss/zero-add 5066=5066; zero resurrection (184 revert commits, 10844 meaningful lines, 0 hits) with falsifiable self-check PASS; review found 1 must-fix: PlayerPlaybackRegressionSourceTest multiline literals were always-false under CRLF (failed livePlaybackAlwaysAutoplaysWhileVodUsesTheConfiguredPolicy AND silently voided assertAlwaysAutoplay for mobile/leanback LiveActivity), fixed by normalizing line endings in read(); 3 mutation probes (PlaybackActivity L353, LiveActivity L389, checkOrientation L255) all turned red as expected then reverted; PlayerPlaybackRegressionSourceTest 15/15 + SiteDialogLayoutTest 4/4 failures=0 errors=0 skipped=0; compileMobileArm64_v8aDebugJavaWithJavac + compileLeanbackArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL; git diff --check clean; gradlew clean BUILD SUCCESSFUL; check_ui_tokens.sh --strict contrast pairs=38 failures=0 min=4.28 (2 hex-scan violations pre-existing on beta, not in CI)

Task-Guard: C71-beta-merge-review-dev2-20261015
This commit is contained in:
Silent1566 2026-10-15 13:29:42 +08:00
commit 3c9cffa4c9
17 changed files with 875 additions and 55 deletions