opt: video page

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>

lib/pages/video/detail/controller.dart

@@ -849,6 +849,7 @@ class VideoDetailController extends GetxController
       viewPointList: viewPointList,
       vttSubtitles: _vttSubtitles,
       vttSubtitlesIndex: vttSubtitlesIndex,
+      showVP: showVP,
       // 硬解
       enableHA: enableHA.value,
       hwdec: hwdec.value,
@@ -1580,6 +1581,7 @@ class VideoDetailController extends GetxController
 
   List<Map<String, String>> _vttSubtitles = <Map<String, String>>[];
   int vttSubtitlesIndex = 0;
+  bool showVP = true;
 
   void _getSubtitle() {
     _vttSubtitles.clear();
@@ -1646,6 +1648,7 @@ class VideoDetailController extends GetxController
       }).toList();
       if (plPlayerController.viewPointList.isEmpty) {
         plPlayerController.viewPointList.value = viewPointList;
+        plPlayerController.showVP.value = showVP = true;
       }
     }
   }

lib/pages/video/detail/view.dart

@@ -183,10 +183,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     if (videoDetailController.autoPlay.value) {
       plPlayerController = videoDetailController.plPlayerController;
       plPlayerController!.addStatusLister(playerListener);
+      plPlayerController!.addPositionListener(positionListener);
       await plPlayerController!.autoEnterFullscreen();
     }
   }
 
+  void positionListener(Duration position) {
+    if (position.inSeconds != videoDetailController.defaultST.inSeconds) {
+      videoDetailController.defaultST = position;
+    }
+  }
+
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) {
     if (state == AppLifecycleState.resumed) {
@@ -264,6 +271,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     videoDetailController.isShowCover.value = false;
     await videoDetailController.playerInit(autoplay: true);
     plPlayerController!.addStatusLister(playerListener);
+    plPlayerController!.addPositionListener(positionListener);
     await plPlayerController!.autoEnterFullscreen();
     videoDetailController.autoPlay.value = true;
   }
@@ -291,7 +299,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
 
   void _makeHeartBeat() {
     plPlayerController!.makeHeartBeat(
-      plPlayerController!.positionSeconds.value,
+      videoDetailController.defaultST.inSeconds,
       type: 'status',
       isManual: true,
       bvid: videoDetailController.bvid,
@@ -321,6 +329,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
     if (plPlayerController != null) {
       _makeHeartBeat();
       plPlayerController!.removeStatusLister(playerListener);
+      plPlayerController!.removePositionListener(positionListener);
       plPlayerController!.dispose();
     } else {
       PlPlayerController.updatePlayCount();
@@ -347,16 +356,17 @@ class _VideoDetailPageState extends State<VideoDetailPage>
         plPlayerController?.playerStatus.status.value;
 
     /// 开启
-    if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: true)
+    // if (setting.get(SettingBoxKey.enableAutoBrightness, defaultValue: true)
-        as bool) {
+    //     as bool) {
-      videoDetailController.brightness = plPlayerController?.brightness.value;
+    videoDetailController.brightness = plPlayerController?.brightness.value;
-    }
+    // }
     if (plPlayerController != null) {
       _makeHeartBeat();
       videoDetailController.vttSubtitlesIndex =
           plPlayerController!.vttSubtitlesIndex.value;
-      videoDetailController.defaultST = plPlayerController!.position.value;
+      videoDetailController.showVP = plPlayerController!.showVP.value;
       plPlayerController!.removeStatusLister(playerListener);
+      plPlayerController!.removePositionListener(positionListener);
       plPlayerController!.pause();
     }
     isShowing = false;
@@ -421,6 +431,7 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       AutoOrientation.fullAutoMode();
     });
     plPlayerController?.addStatusLister(playerListener);
+    plPlayerController?.addPositionListener(positionListener);
   }
 
   @override

lib/pages/whisper/view.dart

@@ -248,11 +248,11 @@ class _WhisperPageState extends State<WhisperPage> {
                                     leading: Badge(
                                       isLabelVisible:
                                           sessionList[i].unreadCount > 0,
-                                      backgroundColor:
+                                      // backgroundColor:
-                                          Theme.of(context).colorScheme.primary,
+                                      //     Theme.of(context).colorScheme.primary,
-                                      textColor: Theme.of(context)
+                                      // textColor: Theme.of(context)
-                                          .colorScheme
+                                      //     .colorScheme
-                                          .onInverseSurface,
+                                      //     .onInverseSurface,
                                       label: Text(
                                           " ${sessionList[i].unreadCount.toString()} "),
                                       alignment: Alignment.topRight,

lib/plugin/pl_player/controller.dart

@@ -407,6 +407,7 @@ class PlPlayerController {
     List<Segment>? viewPointList,
     List<Map<String, String>>? vttSubtitles,
     int? vttSubtitlesIndex,
+    bool? showVP,
     bool autoplay = true,
     // 默认不循环
     PlaylistMode looping = PlaylistMode.none,
@@ -434,6 +435,7 @@ class PlPlayerController {
       this.viewPointList.value = viewPointList ?? <Segment>[];
       this.vttSubtitles.value = vttSubtitles ?? <Map<String, String>>[];
       this.vttSubtitlesIndex.value = vttSubtitlesIndex ?? 0;
+      this.showVP.value = showVP ?? true;
       _autoPlay = autoplay;
       _looping = looping;
       // 初始化视频倍速
@@ -459,7 +461,10 @@ class PlPlayerController {
           dataSource, _looping, enableHA, hwdec, width, height);
       // 获取视频时长 00:00
       _duration.value = duration ?? _videoPlayerController!.state.duration;
+      _position.value = _sliderPosition.value = seekTo;
       updateDurationSecond();
+      updatePositionSecond();
+      updateSliderPositionSecond();
       // 数据加载完成
       dataStatus.status.value = DataStatus.loaded;
 

lib/utils/login.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'dart:math';
 
 import 'package:crypto/crypto.dart';
-import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:PiliPalaX/pages/dynamics/index.dart';
 import 'package:PiliPalaX/pages/home/index.dart';
@@ -29,7 +29,8 @@ class LoginUtils {
       MediaController mediaCtr = Get.find<MediaController>();
       mediaCtr.userLogin.value = status;
     } catch (err) {
-      SmartDialog.showToast('refreshLoginStatus error: ${err.toString()}');
+      // SmartDialog.showToast('refreshLoginStatus error: ${err.toString()}');
+      debugPrint('refreshLoginStatus error: $err');
     }
   }
 
@@ -67,11 +68,11 @@ class LoginUtils {
 
     final Random random = Random(); // Random.secure();
     final String randomHex32 =
-    List.generate(32, (index) => random.nextInt(16).toRadixString(16))
+        List.generate(32, (index) => random.nextInt(16).toRadixString(16))
-        .join();
+            .join();
     final String randomHex16 =
-    List.generate(16, (index) => random.nextInt(16).toRadixString(16))
+        List.generate(16, (index) => random.nextInt(16).toRadixString(16))
-        .join();
+            .join();
 
     final String deviceID = randomHex32 + yyyyMMddHHmmss + randomHex16;