UcnacDx2 · google-labs-jules · Dec 14, 2025 · Dec 14, 2025 · Dec 14, 2025 · Dec 14, 2025
diff --git a/android/app/src/main/kotlin/com/example/piliplus/MainActivity.kt b/android/app/src/main/kotlin/com/example/piliplus/MainActivity.kt
@@ -2,7 +2,9 @@ package com.example.piliplus
 
 import android.app.PictureInPictureParams
 import android.app.SearchManager
+import android.app.UiModeManager
 import android.content.ComponentName
+import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Configuration
@@ -28,6 +30,12 @@ class MainActivity : AudioServiceActivity() {
         methodChannel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, "PiliPlus")
         methodChannel.setMethodCallHandler { call, result ->
             when (call.method) {
+                "checkTvMode" -> {
+                    val uiModeManager = getSystemService(Context.UI_MODE_SERVICE) as UiModeManager
+                    val isTv = uiModeManager.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION ||
+                            packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+                    result.success(isTv)
+                }
                 "back" -> back();
                 "biliSendCommAntifraud" -> {
                     try {

diff --git a/lib/main.dart b/lib/main.dart
@@ -230,20 +230,18 @@ class MyApp extends StatelessWidget {
     final plCtr = PlPlayerController.instance;
     if (plCtr != null) {
       if (plCtr.isFullScreen.value) {
-        plCtr
-          ..triggerFullScreen(status: false)
-          ..controlsLock.value = false
-          ..showControls.value = false;
+        if (plCtr.controlsLock.value) {
+          plCtr.onLockControl(false);
+        }
+        plCtr.triggerFullScreen(status: false);
         return;
       }
 
       if (plCtr.isDesktopPip) {
-        plCtr
-          ..exitDesktopPip().whenComplete(
-            () => plCtr.initialFocalPoint = Offset.zero,
-          )
-          ..controlsLock.value = false
-          ..showControls.value = false;
+        if (plCtr.controlsLock.value) {
+          plCtr.onLockControl(false);
+        }
+        plCtr.exitDesktopPip();
         return;
       }
     }

diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart
@@ -40,9 +40,11 @@ class LiveRoomController extends GetxController {
 
   int roomId = Get.arguments;
   DanmakuController<DanmakuExtra>? danmakuController;
-  PlPlayerController plPlayerController = PlPlayerController.getInstance(
-    isLive: true,
-  );
+  PlPlayerController get plPlayerController =>
+      PlPlayerController.getInstance<PlPlayerController>(
+        tag: roomId.toString(),
+        create: () => PlPlayerController()..isLive = true,
+      );
 
   RxBool isLoaded = false.obs;
   Rx<RoomInfoH5Data?> roomInfoH5 = Rx<RoomInfoH5Data?>(null);

diff --git a/lib/pages/main/view.dart b/lib/pages/main/view.dart
@@ -164,17 +164,22 @@ class _MainAppState extends State<MainApp>
 
   void _onHideWindow() {
     if (_mainController.pauseOnMinimize) {
-      _mainController.isPlaying =
-          PlPlayerController.instance?.playerStatus.value ==
-          PlayerStatus.playing;
-      PlPlayerController.pauseIfExists();
+      final instance = PlPlayerController.instance;
+      if (instance != null) {
+        _mainController.isPlaying =
+            instance.playerStatus.value == PlayerStatus.playing;
+        PlPlayerController.pauseIfExists(tag: instance.bvid);
+      }
     }
   }
 
   void _onShowWindow() {
     if (_mainController.pauseOnMinimize) {
       if (_mainController.isPlaying) {
-        PlPlayerController.playIfExists();
+        final instance = PlPlayerController.instance;
+        if (instance != null) {
+          PlPlayerController.playIfExists(tag: instance.bvid);
+        }
       }
     }
   }

diff --git a/lib/pages/video/controller.dart b/lib/pages/video/controller.dart
@@ -43,6 +43,7 @@ import 'package:PiliPlus/models_new/video/video_stein_edgeinfo/data.dart';
 import 'package:PiliPlus/pages/audio/view.dart';
 import 'package:PiliPlus/pages/search/widgets/search_text.dart';
 import 'package:PiliPlus/pages/video/download_panel/view.dart';
+import 'package:PiliPlus/pages/common/common_intro_controller.dart';
 import 'package:PiliPlus/pages/video/introduction/pgc/controller.dart';
 import 'package:PiliPlus/pages/video/introduction/ugc/controller.dart';
 import 'package:PiliPlus/pages/video/medialist/view.dart';
@@ -121,8 +122,11 @@ class VideoDetailController extends GetxController
   final videoPlayerKey = GlobalKey();
   final childKey = GlobalKey<ScaffoldState>();
 
-  final plPlayerController = PlPlayerController.getInstance()
-    ..brightness.value = -1;
+  PlPlayerController get plPlayerController =>
+      PlPlayerController.getInstance<PlPlayerController>(
+        tag: heroTag,
+        create: () => PlPlayerController(),
+      );
   bool get setSystemBrightness => plPlayerController.setSystemBrightness;
 
   late VideoItem firstVideo;
@@ -1034,6 +1038,7 @@ class VideoDetailController extends GetxController
           return SendDanmakuPanel(
             cid: cid.value,
             bvid: bvid,
+            heroTag: heroTag,
             progress: plPlayerController.position.value.inMilliseconds,
             initialValue: savedDanmaku,
             onSave: (danmaku) => savedDanmaku = danmaku,
@@ -1814,6 +1819,10 @@ class VideoDetailController extends GetxController
     return false;
   }
 
+  CommonIntroController get introController => isUgc
+      ? Get.find<UgcIntroController>(tag: heroTag)
+      : Get.find<PgcIntroController>(tag: heroTag);
+
   void toAudioPage() {
     int? id;
     int? extraId;

diff --git a/lib/pages/video/send_danmaku/view.dart b/lib/pages/video/send_danmaku/view.dart
@@ -21,6 +21,7 @@ class SendDanmakuPanel extends CommonTextPubPage {
   // video
   final dynamic cid;
   final dynamic bvid;
+  final String heroTag;
   final dynamic progress;
 
   final ValueChanged<DanmakuContentItem<DanmakuExtra>> callback;
@@ -36,6 +37,7 @@ class SendDanmakuPanel extends CommonTextPubPage {
     super.onSave,
     this.cid,
     this.bvid,
+    required this.heroTag,
     this.progress,
     required this.callback,
     required this.darkVideoPage,
@@ -481,7 +483,8 @@ class _SendDanmakuPanelState extends CommonTextPubPageState<SendDanmakuPanel> {
       if (response.dmid case final dmid?) {
         extra = VideoDanmaku(
           id: dmid,
-          mid: PlPlayerController.instance!.midHash,
+          mid:
+              PlPlayerController.getInstanceByTag(widget.heroTag)!.midHash,
         );
       }
       widget.callback(

diff --git a/lib/pages/video/view.dart b/lib/pages/video/view.dart
@@ -43,6 +43,8 @@ import 'package:PiliPlus/plugin/pl_player/controller.dart';
 import 'package:PiliPlus/plugin/pl_player/models/fullscreen_mode.dart';
 import 'package:PiliPlus/plugin/pl_player/models/play_repeat.dart';
 import 'package:PiliPlus/plugin/pl_player/models/play_status.dart';
+import 'package:PiliPlus/plugin/pl_player/tv_controller.dart';
+import 'package:PiliPlus/plugin/pl_player/tv_view.dart';
 import 'package:PiliPlus/plugin/pl_player/utils/fullscreen.dart';
 import 'package:PiliPlus/plugin/pl_player/view.dart';
 import 'package:PiliPlus/services/service_locator.dart';
@@ -77,6 +79,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
     with TickerProviderStateMixin, RouteAware, WidgetsBindingObserver {
   final heroTag = Get.arguments['heroTag'];
 
+  bool _isTvMode = false;
   late final VideoDetailController videoDetailController;
   late final VideoReplyController _videoReplyController;
   PlPlayerController? plPlayerController;
@@ -128,6 +131,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
   @override
   void initState() {
     super.initState();
+    _checkDeviceType();
 
     PlPlayerController.setPlayCallBack(playCallBack);
     videoDetailController = Get.put(VideoDetailController(), tag: heroTag);
@@ -157,15 +161,28 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
     WidgetsBinding.instance.addObserver(this);
   }
 
+  Future<void> _checkDeviceType() async {
+    _isTvMode = await Utils.isTvMode;
+    if (mounted) {
+      setState(() {});
+    }
+  }
+
   // 获取视频资源，初始化播放器
   Future<void> videoSourceInit() async {
     videoDetailController.queryVideoUrl();
     if (videoDetailController.autoPlay.value) {
-      plPlayerController = videoDetailController.plPlayerController;
+      plPlayerController = _isTvMode
+          ? (PlPlayerController.getInstance<TvPlayerController>(
+              tag: heroTag, create: () => TvPlayerController()))
+          : videoDetailController.plPlayerController;
+      PlPlayerController.setActive(heroTag);
       plPlayerController!
         ..addStatusLister(playerListener)
         ..addPositionListener(positionListener);
-      await plPlayerController!.autoEnterFullscreen();
+      if (!_isTvMode) {
+        await plPlayerController!.autoEnterFullscreen();
+      }
     }
   }
 
@@ -305,6 +322,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
       }
     }
     plPlayerController = videoDetailController.plPlayerController;
+    PlPlayerController.setActive(heroTag);
     videoDetailController.autoPlay.value = true;
     if (videoDetailController.plPlayerController.preInitPlayer) {
       await plPlayerController!.play();
@@ -319,6 +337,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
 
   @override
   void dispose() {
+    PlPlayerController.unsetActive(heroTag);
     plPlayerController
       ?..removeStatusLister(playerListener)
       ..removePositionListener(positionListener);
@@ -359,7 +378,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
         videoDetailController.makeHeartBeat();
         plPlayerController!.dispose();
       } else {
-        PlPlayerController.updatePlayCount();
+        PlPlayerController.updatePlayCount(heroTag);
       }
     }
     PageUtils.routeObserver.unsubscribe(this);
@@ -1340,43 +1359,54 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
   Widget plPlayer({
     required double width,
     required double height,
-    bool isPipMode = false,
-  }) => Obx(
-    key: videoDetailController.videoPlayerKey,
-    () =>
-        videoDetailController.videoState.value is! Success ||
-            !videoDetailController.autoPlay.value ||
-            plPlayerController?.videoController == null
-        ? const SizedBox.shrink()
-        : PLVideoPlayer(
-            maxWidth: width,
-            maxHeight: height,
-            plPlayerController: plPlayerController!,
-            videoDetailController: videoDetailController,
-            introController: introController,
-            headerControl: HeaderControl(
-              key: videoDetailController.headerCtrKey,
-              isPortrait: isPortrait,
-              controller: videoDetailController.plPlayerController,
-              videoDetailCtr: videoDetailController,
+  }) =>
+      Obx(
+        key: videoDetailController.videoPlayerKey,
+        () {
+          if (videoDetailController.videoState.value is! Success ||
+              !videoDetailController.autoPlay.value ||
+              plPlayerController?.videoController == null) {
+            return const SizedBox.shrink();
+          }
+
+          if (_isTvMode) {
+            return TvVideoPlayer(
+              controller: plPlayerController! as TvPlayerController,
               heroTag: heroTag,
-            ),
-            danmuWidget: isPipMode && pipNoDanmaku
-                ? null
-                : Obx(
-                    () => PlDanmaku(
-                      key: ValueKey(videoDetailController.cid.value),
-                      isPipMode: isPipMode,
-                      cid: videoDetailController.cid.value,
-                      playerController: plPlayerController!,
-                      isFullScreen: plPlayerController!.isFullScreen.value,
-                      isFileSource: videoDetailController.isFileSource,
+            );
+          } else {
+            bool isPipMode = videoDetailController.plPlayerController.isPipMode;
+            return PLVideoPlayer(
+              maxWidth: width,
+              maxHeight: height,
+              plPlayerController: plPlayerController!,
+              videoDetailController: videoDetailController,
+              introController: introController,
+              headerControl: HeaderControl(
+                key: videoDetailController.headerCtrKey,
+                isPortrait: isPortrait,
+                controller: videoDetailController.plPlayerController,
+                videoDetailCtr: videoDetailController,
+                heroTag: heroTag,
+              ),
+              danmuWidget: isPipMode && pipNoDanmaku
+                  ? null
+                  : Obx(
+                      () => PlDanmaku(
+                        key: ValueKey(videoDetailController.cid.value),
+                        isPipMode: isPipMode,
+                        cid: videoDetailController.cid.value,
+                        playerController: plPlayerController!,
+                        isFullScreen: plPlayerController!.isFullScreen.value,
+                        isFileSource: videoDetailController.isFileSource,
+                      ),
                     ),
-                  ),
-            showEpisodes: showEpisodes,
-            showViewPoints: showViewPoints,
-          ),
-  );
+              showEpisodes: showEpisodes,
+              showViewPoints: showViewPoints,
+            );
+          }
+        },
+      );
 
   late ThemeData themeData;
   late bool isPortrait;
@@ -1388,7 +1418,7 @@ class _VideoDetailPageVState extends State<VideoDetailPageV>
   Widget build(BuildContext context) {
     Widget child;
     if (videoDetailController.plPlayerController.isPipMode) {
-      child = plPlayer(width: maxWidth, height: maxHeight, isPipMode: true);
+      child = plPlayer(width: maxWidth, height: maxHeight);
     } else if (!videoDetailController.horizontalScreen) {
       child = childWhenDisabled;
     } else if (maxWidth / maxHeight >= kScreenRatio) {