merge: sync beta latest and re-review dev4 changes

Browse source

Verification: merged origin/beta b4501c91c7 into dev4; resolved TmdbDetailActivity import conflict preserving FOLLOW-1 and ConfigEvent; git diff --check and git diff --cached --check pass; :app:compileLeanbackArm64_v8aDebugJavaWithJavac and :app:compileMobileArm64_v8aDebugJavaWithJavac BUILD SUCCESSFUL; :app:testMobileArm64_v8aDebugUnitTest 4745 tests, 0 failures, 0 errors, 1 skipped

Task-Guard: C18-beta-sync-review-dev4-20260920

...

This commit is contained in:

Silent1566 2026-09-20 16:07:03 +08:00

parent ea485ee9bf b4501c91c7

commit 9f998d6808

51 changed files with 4338 additions and 384 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

230

app/src/androidTest/java/com/fongmi/android/tv/ui/activity/C16SubscriptionCredentialDeviceTest.java

View file

15

app/src/leanback/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

View file

218

app/src/leanback/java/com/fongmi/android/tv/ui/dialog/AdBlockStatsDialog.java

View file

2

app/src/leanback/java/com/fongmi/android/tv/ui/dialog/EpisodeDetailDialog.java

View file

108

app/src/leanback/res/layout/adapter_ad_block_log.xml

View file

512

app/src/leanback/res/layout/dialog_ad_block_stats.xml

View file

7

app/src/leanback/res/values/styles.xml

View file

7

app/src/main/java/androidx/media3/mpvplayer/MpvHlsProxy.java

View file

11

app/src/main/java/com/fongmi/android/tv/Updater.java

View file

11

app/src/main/java/com/fongmi/android/tv/api/SiteApi.java

View file

98

app/src/main/java/com/fongmi/android/tv/api/TmdbSourceCredentialIngress.java

View file

260

app/src/main/java/com/fongmi/android/tv/api/config/SubscriptionTmdbCredentialStore.java

View file

38

app/src/main/java/com/fongmi/android/tv/api/config/VodConfig.java

View file

127

app/src/main/java/com/fongmi/android/tv/bean/AdBlockLogFilter.java

View file

103

app/src/main/java/com/fongmi/android/tv/bean/TmdbConfig.java

View file

2

app/src/main/java/com/fongmi/android/tv/service/PersonalRecommendationService.java

View file

28

app/src/main/java/com/fongmi/android/tv/service/TmdbService.java

View file

23

app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivity.java

View file

2

app/src/main/java/com/fongmi/android/tv/ui/activity/TmdbPersonActivity.java

View file

304

app/src/main/java/com/fongmi/android/tv/ui/dialog/AdBlockLogFilterDialog.java

View file

2

app/src/main/java/com/fongmi/android/tv/ui/dialog/TmdbPersonDialog.java

View file

109

app/src/main/java/com/fongmi/android/tv/ui/helper/TmdbUIAdapter.java

View file

27

app/src/main/res/layout/adapter_tmdb_recommendation.xml

View file

16

app/src/main/res/values-zh-rCN/strings.xml

View file

16

app/src/main/res/values/strings.xml

View file

11

app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java

View file

218

app/src/mobile/java/com/fongmi/android/tv/ui/dialog/AdBlockStatsDialog.java

View file

4

app/src/mobile/java/com/fongmi/android/tv/ui/dialog/EpisodeDetailDialog.java

View file

108

app/src/mobile/res/layout/adapter_ad_block_log.xml

View file

496

app/src/mobile/res/layout/dialog_ad_block_stats.xml

View file

12

app/src/test/java/androidx/media3/mpvplayer/MpvHlsAdblockGateTest.java

View file

84

app/src/test/java/com/fongmi/android/tv/api/TmdbSourceCredentialContractTest.java

View file

115

app/src/test/java/com/fongmi/android/tv/api/TmdbSourceCredentialIngressTest.java

View file

46

app/src/test/java/com/fongmi/android/tv/api/TmdbSourceCredentialWiringTest.java

View file

36

app/src/test/java/com/fongmi/android/tv/api/VodConfigSubscriptionCredentialWiringTest.java

View file

106

app/src/test/java/com/fongmi/android/tv/api/config/SubscriptionTmdbCredentialStoreTest.java

View file

64

app/src/test/java/com/fongmi/android/tv/bean/AdBlockLogFilterTest.java

View file

80

app/src/test/java/com/fongmi/android/tv/bean/TmdbConfigEffectiveTest.java

View file

38

app/src/test/java/com/fongmi/android/tv/service/PersonalRecommendationSourceCredentialTest.java

View file

103

app/src/test/java/com/fongmi/android/tv/service/TmdbServiceCredentialScopeTest.java

View file

41

app/src/test/java/com/fongmi/android/tv/service/TmdbServiceErrorRedactionTest.java

View file

8

app/src/test/java/com/fongmi/android/tv/ui/activity/VideoActivityRuntimeModeWiringTest.java

View file

57

app/src/test/java/com/fongmi/android/tv/ui/helper/TmdbRuntimeCredentialWiringTest.java

View file

62

app/src/test/java/com/fongmi/android/tv/ui/helper/TmdbSourceHybridWiringTest.java

View file

25

app/src/test/java/com/fongmi/android/tv/ui/helper/TmdbUIAdapterSourceOnlyTest.java

View file

1

app/src/testMobile/java/com/fongmi/android/tv/ui/activity/TmdbDetailActivityLayoutTest.java

View file

9

app/src/testMobile/java/com/fongmi/android/tv/ui/dialog/AdBlockStatsDialogLayoutTest.java

View file

652

docs/C16-tmdb-source-detail-contract.md

View file

53

docs/C18-beta-sync-review-dev4-20260920.md

View file

29

docs/beta-sync-review-dev2-20260919.md

View file

4

docs/upstream-player-dependency-merge-assessment-2026-08-20.md

View file