Merge pull request #407 from Silent1566/dev2

dev2: 合并 beta 最新代码（PR#403-#406）并复评修复焦点环注释裸 hex 门禁回归
2026-10-08 19:44:46 +00:00 · 2026-10-05 13:28:55 +08:00 · 2026-10-05 13:28:55 +08:00 · 03c239e32e
commit 03c239e32e
parent 79244f274d 2162548799
76 changed files with 6623 additions and 27 deletions
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
--- a/app/src/leanback/res/layout/activity_setting.xml
+++ b/app/src/leanback/res/layout/activity_setting.xml
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
--- a/app/src/main/java/androidx/media3/mpvplayer/MpvHlsCacheCoordinator.java
+++ b/app/src/main/java/androidx/media3/mpvplayer/MpvHlsCacheCoordinator.java
--- a/app/src/main/java/com/fongmi/android/tv/App.java
+++ b/app/src/main/java/com/fongmi/android/tv/App.java
--- a/app/src/main/java/com/fongmi/android/tv/Updater.java
+++ b/app/src/main/java/com/fongmi/android/tv/Updater.java
--- a/app/src/main/java/com/fongmi/android/tv/api/loader/BaseLoader.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/loader/BaseLoader.java
--- a/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java
--- a/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java
--- a/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java
--- a/app/src/main/java/com/fongmi/android/tv/api/parser/EpgParser.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/parser/EpgParser.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheAutoCleanupPolicy.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheAutoCleanupPolicy.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheAvailability.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheAvailability.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCenter.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCenter.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanability.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanability.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupJobService.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupJobService.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupJournal.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupJournal.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupManager.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupManager.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupMode.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupMode.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupPlan.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupPlan.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupProgress.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupProgress.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupRecord.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupRecord.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupResult.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupResult.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupStatus.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheCleanupStatus.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheEvictionPolicy.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheEvictionPolicy.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheFormat.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheFormat.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheGroup.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheGroup.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheInventory.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheInventory.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheLegacyRules.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheLegacyRules.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheLimitOptions.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheLimitOptions.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheMeasurement.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheMeasurement.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheModule.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheModule.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheModuleId.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheModuleId.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheModuleRegistry.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheModuleRegistry.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CachePathSafety.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CachePathSafety.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CachePolicyEngine.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CachePolicyEngine.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CachePolicyStore.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CachePolicyStore.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheProtection.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheProtection.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheRetentionManager.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheRetentionManager.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheRoot.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheRoot.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheScheduler.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheScheduler.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheSnapshot.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheSnapshot.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheTempFilePolicy.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheTempFilePolicy.java
--- a/app/src/main/java/com/fongmi/android/tv/cache/CacheTotalLimitPolicy.java
+++ b/app/src/main/java/com/fongmi/android/tv/cache/CacheTotalLimitPolicy.java
--- a/app/src/main/java/com/fongmi/android/tv/event/RefreshEvent.java
+++ b/app/src/main/java/com/fongmi/android/tv/event/RefreshEvent.java
--- a/app/src/main/java/com/fongmi/android/tv/player/exo/MediaSourceFactory.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/exo/MediaSourceFactory.java
--- a/app/src/main/java/com/fongmi/android/tv/player/karaoke/KaraokeTrackRepository.java
+++ b/app/src/main/java/com/fongmi/android/tv/player/karaoke/KaraokeTrackRepository.java
--- a/app/src/main/java/com/fongmi/android/tv/server/process/ApkUrlPush.java
+++ b/app/src/main/java/com/fongmi/android/tv/server/process/ApkUrlPush.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/OkGlideModule.java
+++ b/app/src/main/java/com/fongmi/android/tv/utils/OkGlideModule.java
--- a/app/src/main/java/com/fongmi/android/tv/web/WebHomeRawAdapter.java
+++ b/app/src/main/java/com/fongmi/android/tv/web/WebHomeRawAdapter.java
--- a/app/src/main/res/color/focus_ring_error.xml
+++ b/app/src/main/res/color/focus_ring_error.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/layout/dialog_cache_management.xml
+++ b/app/src/main/res/layout/dialog_cache_management.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/strings.xml
+++ b/app/src/main/res/values/strings.xml
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
--- a/app/src/mobile/res/layout/fragment_setting.xml
+++ b/app/src/mobile/res/layout/fragment_setting.xml
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheAutoCleanupPolicyTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheAutoCleanupPolicyTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheAutoPlanAndTempFamilyTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheAutoPlanAndTempFamilyTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheCleanupJournalTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheCleanupJournalTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheInventoryTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheInventoryTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheLegacyRulesTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheLegacyRulesTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheModuleRegistryTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheModuleRegistryTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CachePathSafetyTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CachePathSafetyTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CachePolicyEngineTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CachePolicyEngineTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CachePolicyStoreTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CachePolicyStoreTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheRetentionManagerTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheRetentionManagerTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheRootPrefixTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheRootPrefixTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheTempFilePolicyTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheTempFilePolicyTest.java
--- a/app/src/test/java/com/fongmi/android/tv/cache/CacheTotalLimitPolicyTest.java
+++ b/app/src/test/java/com/fongmi/android/tv/cache/CacheTotalLimitPolicyTest.java
--- a/docs/C37-upstream-sync-silent1566.md
+++ b/docs/C37-upstream-sync-silent1566.md
--- a/docs/C38-beta-merge-review-dev2-20261005.md
+++ b/docs/C38-beta-merge-review-dev2-20261005.md
--- a/docs/CACHE-MGMT-01-cache-management-design.md
+++ b/docs/CACHE-MGMT-01-cache-management-design.md
--- a/docs/upstream-player-dependency-merge-assessment-2026-08-20.md
+++ b/docs/upstream-player-dependency-merge-assessment-2026-08-20.md