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

merge+review(C104): 合并 origin/beta 8322438787 并评审徽标常驻语义与扩充包改动

Browse source 
合并：git merge --no-ff --no-commit origin/beta，0 冲突，带入 24 路径
（20 M + 4 A，+1216/-87），24/24 blob 与 origin/beta 逐字节一致；
带入路径与本地未推送改动路径交集为空，故 beta 内容按既有 dev4 评审跳过。

评审：dev1 未推送的 192b55c2fc / 11be83da8b 共 34 路径全量复核——
MediaBadgeCatalog 100→127 条（新增 VIDEO_TECH/EDITION 两组）、
MediaBadgeResolver 补 8K/12bit/VVC/LPCM/7.1.4/5.1.4/5.1.2 七条运行时事实、
PlayerOsdController 改为「控制栏唤醒无条件显示、关闭后按媒体信息开关常驻」并把
角落内边距随控制栏切换、胶囊固定 dp(20) 等高、新增 28 张牌图与 1 张重绘。

修复（2 项文档口径，无运行时代码缺陷）：
- MediaBadgeCatalog.java:6 注释 124/24 条更正为 127/27 条，补全非运行时组列举；
- docs/osd-media-badges.md 牌图体积 620KB→646KB（实测 661706 字节）、
  分组数 13→15 注记、用例行数 365→367 对齐实测。

新增 docs/C104-beta-merge-review-dev1-osd-20261025.md 记录合并/评审/验证/复评。

Verification: 双 flavor arm64 Debug 定向单测通过（mobile 53 例 / leanback 33 例，0 失败 0 错误）：MediaBadgeResolverTest 27、PlayerDisplaySettingSyncTest 9、ControlDialogOsdSettingsTest 9、DroppedFrameAccountingTest 8、TvFixedLightSurfaceContrastTest 4、ThemeEditorPanelTest 2；合并 24 路径 blob 与 origin/beta 逐字节一致 24/24；git diff --cached --check 为空

Task-Guard: C104-BETA-MERGE-DEV1-OSD-20261025
This commit is contained in:
Silent1566 2026-10-25 02:12:03 +08:00
commit 3cfe93f389
27 changed files with 1331 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/src/leanback/res/drawable/selector_exit_confirm_secondary.xml
View file

24
app/src/leanback/res/layout/adapter_ad_block_log.xml
View file

2
app/src/leanback/res/layout/adapter_ad_rule.xml
View file

6
app/src/leanback/res/layout/adapter_ad_stats_item.xml
View file

86
app/src/leanback/res/layout/dialog_ad_block_stats.xml
View file

4
app/src/leanback/res/layout/dialog_exit_confirm.xml
View file

2
app/src/leanback/res/layout/dialog_update.xml
View file

4
app/src/main/java/com/fongmi/android/tv/player/MediaBadgeCatalog.java
View file

12
app/src/main/res/color/fixed_light_focus_icon.xml
View file

15
app/src/main/res/color/fixed_light_focus_text.xml
View file

6
app/src/main/res/layout/adapter_custom_csp.xml
View file

10
app/src/main/res/layout/adapter_mpv_config_profile.xml
View file

4
app/src/main/res/layout/dialog_ai_recommendation_info.xml
View file

4
app/src/main/res/layout/dialog_custom_csp.xml
View file

2
app/src/main/res/layout/dialog_mpv_config_create.xml
View file

2
app/src/main/res/layout/dialog_mpv_config_manager.xml
View file

2
app/src/main/res/layout/dialog_mpv_config_rename.xml
View file

2
app/src/main/res/layout/dialog_update_settings.xml
View file

22
app/src/main/res/values/colors.xml
View file

4
app/src/mobile/res/layout/adapter_github_proxy.xml
View file

42
app/src/mobile/res/layout/dialog_ad_block_stats.xml
View file

588
app/src/test/java/com/fongmi/android/tv/theme/TvFixedLightSurfaceContrastTest.java
View file

223
docs/C103-beta-merge-review-dev4-20261024.md
View file

108
docs/C104-beta-merge-review-dev1-osd-20261025.md
View file

102
docs/TV-EXIT-CANCEL-CONTRAST-01-tv-exit-cancel-contrast.md
View file

129
docs/TV-LIGHT-FILL-CONTRAST-ALL-02-tv-fixed-light-surface-foregrounds.md
View file

10
docs/osd-media-badges.md
View file