merge: 合并 beta 最新代码（PR#435/#436 停播/更新判定/数据库完整性）并复评 dev4 屏显对比度改动

Verification: origin/beta=8ed903ac2a75bf76b46ab04e17059a30070d4b63; merge commit parents e0c067cba7 + beta tip; zero conflicts after resolving 5 theme resources to beta latest; index tree f66c980de84b53b4b50c8ec9f59813c67d99cdeb; zero beta deletions and zero beta files missing from index (5030/5030); net diff app/docs only; CustomCsp/theme contrast fixes; C59 update ordering, C60 Room integrity recovery, playback stop regressions; leanback+mobile targeted tests and dual flavor Java/AndroidTest compilation BUILD SUCCESSFUL; diff check clean; Gradle stop+clean done Task-Guard: beta-sync-review-dev4-20261011-r2
2026-10-13 18:27:10 +00:00 · 2026-10-11 16:26:57 +08:00 · 2026-10-11 16:26:57 +08:00 · 3e657bef0d
commit 3e657bef0d
parent e0c067cba7 8ed903ac2a
96 changed files with 4704 additions and 314 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/TmdbRecommendationPresenter.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/presenter/TmdbRecommendationPresenter.java
--- a/app/src/leanback/res/drawable/selector_ad_stats_item.xml
+++ b/app/src/leanback/res/drawable/selector_ad_stats_item.xml
--- a/app/src/leanback/res/drawable/selector_control_sheet_button.xml
+++ b/app/src/leanback/res/drawable/selector_control_sheet_button.xml
--- a/app/src/leanback/res/drawable/selector_danmaku_result_item.xml
+++ b/app/src/leanback/res/drawable/selector_danmaku_result_item.xml
--- a/app/src/leanback/res/drawable/selector_danmaku_search_action.xml
+++ b/app/src/leanback/res/drawable/selector_danmaku_search_action.xml
--- a/app/src/leanback/res/drawable/selector_episode_dialog_item.xml
+++ b/app/src/leanback/res/drawable/selector_episode_dialog_item.xml
--- a/app/src/leanback/res/drawable/selector_episode_dialog_page.xml
+++ b/app/src/leanback/res/drawable/selector_episode_dialog_page.xml
--- a/app/src/leanback/res/drawable/selector_exit_confirm_primary.xml
+++ b/app/src/leanback/res/drawable/selector_exit_confirm_primary.xml
--- a/app/src/leanback/res/drawable/selector_exit_confirm_secondary.xml
+++ b/app/src/leanback/res/drawable/selector_exit_confirm_secondary.xml
--- a/app/src/leanback/res/drawable/selector_search_scope_item.xml
+++ b/app/src/leanback/res/drawable/selector_search_scope_item.xml
--- a/app/src/leanback/res/drawable/selector_video_item.xml
+++ b/app/src/leanback/res/drawable/selector_video_item.xml
--- a/app/src/leanback/res/drawable/shape_chip_activated.xml
+++ b/app/src/leanback/res/drawable/shape_chip_activated.xml
--- a/app/src/leanback/res/drawable/shape_chip_focused.xml
+++ b/app/src/leanback/res/drawable/shape_chip_focused.xml
--- a/app/src/leanback/res/drawable/shape_chip_round_activated.xml
+++ b/app/src/leanback/res/drawable/shape_chip_round_activated.xml
--- a/app/src/leanback/res/drawable/shape_chip_round_focused.xml
+++ b/app/src/leanback/res/drawable/shape_chip_round_focused.xml
--- a/app/src/leanback/res/drawable/shape_config_history_item_focused.xml
+++ b/app/src/leanback/res/drawable/shape_config_history_item_focused.xml
--- a/app/src/leanback/res/drawable/shape_group_button_focused.xml
+++ b/app/src/leanback/res/drawable/shape_group_button_focused.xml
--- a/app/src/leanback/res/drawable/shape_item_focused.xml
+++ b/app/src/leanback/res/drawable/shape_item_focused.xml
--- a/app/src/leanback/res/drawable/shape_item_round_focused.xml
+++ b/app/src/leanback/res/drawable/shape_item_round_focused.xml
--- a/app/src/leanback/res/drawable/shape_item_selected.xml
+++ b/app/src/leanback/res/drawable/shape_item_selected.xml
--- a/app/src/leanback/res/drawable/shape_keyboard_focused.xml
+++ b/app/src/leanback/res/drawable/shape_keyboard_focused.xml
--- a/app/src/leanback/res/drawable/shape_live_focused.xml
+++ b/app/src/leanback/res/drawable/shape_live_focused.xml
--- a/app/src/leanback/res/drawable/shape_search_hot_word_focused.xml
+++ b/app/src/leanback/res/drawable/shape_search_hot_word_focused.xml
--- a/app/src/leanback/res/drawable/shape_site_item_focused.xml
+++ b/app/src/leanback/res/drawable/shape_site_item_focused.xml
--- a/app/src/leanback/res/drawable/shape_site_item_selected.xml
+++ b/app/src/leanback/res/drawable/shape_site_item_selected.xml
--- a/app/src/leanback/res/drawable/shape_subtitle_focused.xml
+++ b/app/src/leanback/res/drawable/shape_subtitle_focused.xml
--- a/app/src/leanback/res/drawable/shape_subtitle_pressed.xml
+++ b/app/src/leanback/res/drawable/shape_subtitle_pressed.xml
--- a/app/src/leanback/res/drawable/shape_video_focused.xml
+++ b/app/src/leanback/res/drawable/shape_video_focused.xml
--- a/app/src/leanback/res/drawable/shape_video_item_focused.xml
+++ b/app/src/leanback/res/drawable/shape_video_item_focused.xml
--- a/app/src/leanback/res/drawable/shape_vod_focused.xml
+++ b/app/src/leanback/res/drawable/shape_vod_focused.xml
--- a/app/src/leanback/res/drawable/shape_vod_oval_focused.xml
+++ b/app/src/leanback/res/drawable/shape_vod_oval_focused.xml
--- a/app/src/leanback/res/layout/dialog_episode_list.xml
+++ b/app/src/leanback/res/layout/dialog_episode_list.xml
--- a/app/src/leanback/res/layout/dialog_quick_search.xml
+++ b/app/src/leanback/res/layout/dialog_quick_search.xml
--- a/app/src/leanback/res/layout/view_progress.xml
+++ b/app/src/leanback/res/layout/view_progress.xml
--- a/app/src/leanback/res/values/styles.xml
+++ b/app/src/leanback/res/values/styles.xml
--- a/app/src/main/java/com/fongmi/android/tv/bean/Update.java
+++ b/app/src/main/java/com/fongmi/android/tv/bean/Update.java
--- a/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java
+++ b/app/src/main/java/com/fongmi/android/tv/db/AppDatabase.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeController.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeController.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeEditor.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeEditor.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemePresets.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemePresets.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemePreviewView.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemePreviewView.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeProfile.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeProfile.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeProfileValidator.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeProfileValidator.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeResolver.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeResolver.java
--- a/app/src/main/java/com/fongmi/android/tv/theme/ThemeTokens.java
+++ b/app/src/main/java/com/fongmi/android/tv/theme/ThemeTokens.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/PlaybackActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/PlaybackActivity.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/adapter/InlineEpisodeAdapter.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/adapter/InlineEpisodeAdapter.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbCardFocusHelper.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbCardFocusHelper.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbEpisodeAdapter.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbEpisodeAdapter.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbVideoAdapter.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/adapter/TmdbVideoAdapter.java
--- a/app/src/main/java/com/fongmi/android/tv/ui/dialog/CacheManagementDialog.java
+++ b/app/src/main/java/com/fongmi/android/tv/ui/dialog/CacheManagementDialog.java
--- a/app/src/main/java/com/fongmi/android/tv/utils/AppVersion.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/AppVersion.java
--- a/app/src/main/res/color/following_button_primary_text.xml
+++ b/app/src/main/res/color/following_button_primary_text.xml
--- a/app/src/main/res/color/following_button_secondary_text.xml
+++ b/app/src/main/res/color/following_button_secondary_text.xml
--- a/app/src/main/res/drawable/selector_cache_button_focus.xml
+++ b/app/src/main/res/drawable/selector_cache_button_focus.xml
--- a/app/src/main/res/drawable/selector_episode_card.xml
+++ b/app/src/main/res/drawable/selector_episode_card.xml
--- a/app/src/main/res/drawable/selector_tmdb_cast_focus.xml
+++ b/app/src/main/res/drawable/selector_tmdb_cast_focus.xml
--- a/app/src/main/res/drawable/selector_tmdb_media_focus.xml
+++ b/app/src/main/res/drawable/selector_tmdb_media_focus.xml
--- a/app/src/main/res/drawable/shape_episode_photo_focused.xml
+++ b/app/src/main/res/drawable/shape_episode_photo_focused.xml
--- a/app/src/main/res/layout/dialog_cache_management.xml
+++ b/app/src/main/res/layout/dialog_cache_management.xml
--- a/app/src/main/res/values-night/webhtv_tokens.xml
+++ b/app/src/main/res/values-night/webhtv_tokens.xml
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
--- a/app/src/main/res/values/webhtv_attrs.xml
+++ b/app/src/main/res/values/webhtv_attrs.xml
--- a/app/src/main/res/values/webhtv_dimens.xml
+++ b/app/src/main/res/values/webhtv_dimens.xml
--- a/app/src/main/res/values/webhtv_styles.xml
+++ b/app/src/main/res/values/webhtv_styles.xml
--- a/app/src/main/res/values/webhtv_tokens.xml
+++ b/app/src/main/res/values/webhtv_tokens.xml
--- a/app/src/mobile/res/layout/dialog_cache_management.xml
+++ b/app/src/mobile/res/layout/dialog_cache_management.xml
--- a/app/src/mobile/res/layout/view_progress.xml
+++ b/app/src/mobile/res/layout/view_progress.xml
--- a/app/src/mobile/res/values/styles.xml
+++ b/app/src/mobile/res/values/styles.xml
--- a/app/src/test/java/com/fongmi/android/tv/bean/UpdateOrderingTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/bean/UpdateOrderingTest.java
--- a/app/src/test/java/com/fongmi/android/tv/db/AppDatabaseIntegrityRecoverySourceTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/db/AppDatabaseIntegrityRecoverySourceTest.java
--- a/app/src/test/java/com/fongmi/android/tv/theme/ThemeContractTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/theme/ThemeContractTest.java
--- a/app/src/test/java/com/fongmi/android/tv/theme/ThemeControllerContractTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/theme/ThemeControllerContractTest.java
--- a/app/src/test/java/com/fongmi/android/tv/ui/activity/PlaybackOwnershipSourceTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/ui/activity/PlaybackOwnershipSourceTest.java
--- a/app/src/test/java/com/fongmi/android/tv/ui/dialog/PlayerSettingsContrastTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/ui/dialog/PlayerSettingsContrastTest.java
--- a/app/src/test/java/com/fongmi/android/tv/utils/AppVersionBuildStampTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/utils/AppVersionBuildStampTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/theme/LightDialogShellOpacityTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/theme/LightDialogShellOpacityTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/NativeEnhancedPlaybackStyleFocusTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/NativeEnhancedPlaybackStyleFocusTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvAppSurfaceFocusRingDeviceTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvAppSurfaceFocusRingDeviceTest.java
--- a/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvFocusRingContractTest.java
+++ b/app/src/testLeanback/java/com/fongmi/android/tv/ui/activity/TvFocusRingContractTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivityLayoutTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivityLayoutTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/VideoActivityLayoutTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/activity/VideoActivityLayoutTest.java
--- a/app/src/testMobile/java/com/fongmi/android/tv/ui/dialog/InterfaceEntryInteractionTest.java
+++ b/app/src/testMobile/java/com/fongmi/android/tv/ui/dialog/InterfaceEntryInteractionTest.java
--- a/docs/C58-beta-merge-review-dev1-20261011.md
+++ b/docs/C58-beta-merge-review-dev1-20261011.md
--- a/docs/C58-beta-merge-review-dev2-20261011.md
+++ b/docs/C58-beta-merge-review-dev2-20261011.md
--- a/docs/C58-beta-merge-review-dev4-20261011.md
+++ b/docs/C58-beta-merge-review-dev4-20261011.md
--- a/docs/C59-android9-box-update-downgrade-fix-20261011.md
+++ b/docs/C59-android9-box-update-downgrade-fix-20261011.md
--- a/docs/C60-android9-box-database-integrity-recovery-20261011.md
+++ b/docs/C60-android9-box-database-integrity-recovery-20261011.md
--- a/docs/C61-beta-merge-review-dev1-20261011.md
+++ b/docs/C61-beta-merge-review-dev1-20261011.md
--- a/docs/TV-FOCUS-RING-20261004-unified-theme-ring.md
+++ b/docs/TV-FOCUS-RING-20261004-unified-theme-ring.md
--- a/docs/webhtv-unified-visual-design-system-20260920.md
+++ b/docs/webhtv-unified-visual-design-system-20260920.md