merge: 合并远端 beta ba802dc432（PR #498 dev1 / #499 dev4 / #500 dev5 / #501 dev3）到 dev2

Browse source

...

This commit is contained in:

Team Lead 2026-10-29 15:49:54 +08:00

parent efdf8be13e ba802dc432

commit 3639181e3e

45 changed files with 3184 additions and 107 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

8

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

View file

5

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

View file

15

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

View file

286

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

View file

79

app/src/main/java/com/fongmi/android/tv/api/loader/BaseLoader.java

View file

10

app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java

View file

25

app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java

View file

24

app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java

View file

2

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

View file

8

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

View file

26

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

View file

28

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

View file

19

app/src/main/java/com/fongmi/android/tv/node/NodeRuntime.java

View file

64

app/src/main/java/com/fongmi/android/tv/server/process/Action.java

View file

93

app/src/main/java/com/fongmi/android/tv/server/process/VodApi.java

View file

65

app/src/main/java/com/fongmi/android/tv/setting/PlayerSetting.java

View file

6

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

View file

203

app/src/main/java/com/fongmi/android/tv/ui/custom/PlayerOsdController.java

View file

6

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

View file

5

app/src/main/java/com/fongmi/android/tv/ui/player/VodPlayerUiController.java

View file

9

app/src/main/java/com/fongmi/android/tv/ui/player/VodPlayerUiHost.java

View file

1

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

View file

1

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

View file

1

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

View file

30

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

View file

5

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

View file

8

app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java

View file

5

app/src/mobile/res/drawable/shape_quick_search_icon_button.xml

View file

6

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

View file

2

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

View file

136

app/src/test/java/com/fongmi/android/tv/api/loader/LoaderNamespaceSlotTest.java

View file

156

app/src/test/java/com/fongmi/android/tv/api/loader/LoaderRecentNamespaceTest.java

View file

89

app/src/test/java/com/fongmi/android/tv/node/NodeRuntimeServingTest.java

View file

135

app/src/test/java/com/fongmi/android/tv/server/process/HistoryScopeSyncTest.java

View file

224

app/src/test/java/com/fongmi/android/tv/server/process/VodApiTest.java

View file

268

app/src/test/java/com/fongmi/android/tv/setting/PlayerDisplaySettingSyncTest.java

View file

98

app/src/test/java/com/fongmi/android/tv/theme/ThemeBaseWiringTest.java

View file

36

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

View file

2

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

View file

8

catvod/src/main/java/com/github/catvod/utils/Prefers.java

View file

290

docs/C109-beta-merge-review-dev5-20261028.md

View file

218

docs/C110-beta-merge-review-dev1-20261028.md

View file

191

docs/C111-beta-merge-review-dev3-20261029.md

View file

179

docs/C111-beta-merge-review-dev4-20261029.md

View file

216

docs/osd-media-badges.md

View file