Merge branch 'main' into fix

lib/common/pages_bottom_sheet.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/constants.dart';
@@ -183,7 +182,7 @@ class _PagesBottomSheetState extends State<PagesBottomSheet>
             isFixedHeight: true,
           );
         } else {
-          _listObserverControllerList![widget.currentEpisodeIndex!]
+          _listObserverControllerList![widget.currentEpisodeIndex ?? 0]
               .initialIndexModel = ObserverIndexPositionModel(
             index: currentIndex,
             isFixedHeight: true,

lib/common/widgets/html_render.dart

@@ -5,6 +5,8 @@ import 'package:pilipala/plugin/pl_gallery/hero_dialog_route.dart';
 import 'package:pilipala/plugin/pl_gallery/interactiveviewer_gallery.dart';
 import 'package:pilipala/utils/highlight.dart';
 
+import '../../utils/global_data_cache.dart';
+
 // ignore: must_be_immutable
 class HtmlRender extends StatelessWidget {
   const HtmlRender({
@@ -41,6 +43,8 @@ class HtmlRender extends StatelessWidget {
         TagExtension(
           tagsToExtend: <String>{'img'},
           builder: (ExtensionContext extensionContext) {
+            int defaultImgQuality = 10;
+            defaultImgQuality = GlobalDataCache.imgQuality;
             try {
               final Map<String, dynamic> attributes =
                   extensionContext.attributes;
@@ -99,13 +103,13 @@ class HtmlRender extends StatelessWidget {
                     ),
                   );
                 },
-                child: CachedNetworkImage(imageUrl: imgUrl),
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(12),
+                  child: CachedNetworkImage(
+                    imageUrl: '$imgUrl@${defaultImgQuality}q.webp',
+                  ),
+                ),
               );
-              // return NetworkImgLayer(
-              //   width: isEmote ? 22 : Get.size.width - 24,
-              //   height: isEmote ? 22 : 200,
-              //   src: imgUrl,
-              // );
             } catch (err) {
               return const SizedBox();
             }
@@ -138,6 +142,14 @@ class HtmlRender extends StatelessWidget {
           textAlign: TextAlign.justify,
         ),
         'img': Style(margin: Margins.only(top: 4, bottom: 4)),
+        'figcaption': Style(
+          textAlign: TextAlign.center,
+          margin: Margins.only(top: 8, bottom: 20),
+          color: Theme.of(context).colorScheme.secondary,
+        ),
+        'figure': Style(
+          margin: Margins.zero,
+        ),
       },
     );
   }

lib/pages/opus/view.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
 import 'package:pilipala/models/read/opus.dart';
+
 import 'controller.dart';
 import 'text_helper.dart';
 
@@ -26,17 +27,19 @@ class _OpusPageState extends State<OpusPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: _buildAppBar(),
-      body: SingleChildScrollView(
+      body: CustomScrollView(
         controller: controller.scrollController,
-        child: Column(
+        slivers: [
-          mainAxisAlignment: MainAxisAlignment.start,
+          SliverList(
-          crossAxisAlignment: CrossAxisAlignment.start,
+            delegate: SliverChildListDelegate(
-          children: [
+              [
                 _buildTitle(),
                 _buildFutureContent(),
               ],
             ),
           ),
+        ],
+      ),
     );
   }
 

lib/pages/read/view.dart

@@ -6,6 +6,7 @@ import 'package:pilipala/models/read/opus.dart';
 import 'package:pilipala/models/read/read.dart';
 import 'package:pilipala/pages/opus/text_helper.dart';
 import 'package:pilipala/utils/utils.dart';
+
 import 'controller.dart';
 
 class ReadPage extends StatefulWidget {
@@ -38,17 +39,19 @@ class _ReadPageState extends State<ReadPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: _buildAppBar(),
-      body: SingleChildScrollView(
+      body: CustomScrollView(
         controller: controller.scrollController,
-        child: Column(
+        slivers: [
-          mainAxisAlignment: MainAxisAlignment.start,
+          SliverList(
-          crossAxisAlignment: CrossAxisAlignment.start,
+            delegate: SliverChildListDelegate(
-          children: [
+              [
                 _buildTitle(),
                 _buildFutureContent(),
               ],
             ),
           ),
+        ],
+      ),
     );
   }
 

lib/pages/video/detail/introduction/controller.dart

@@ -617,6 +617,7 @@ class VideoIntroController extends GetxController {
   // 播放器底栏 选集 回调
   void showEposideHandler() {
     late List episodes;
+    int currentEpisodeIndex = 0;
     VideoEpidoesType dataType = VideoEpidoesType.videoEpisode;
     if (videoDetail.value.ugcSeason != null) {
       dataType = VideoEpidoesType.videoEpisode;
@@ -625,6 +626,7 @@ class VideoIntroController extends GetxController {
         final List<EpisodeItem> episodesList = sections[i].episodes!;
         for (int j = 0; j < episodesList.length; j++) {
           if (episodesList[j].cid == lastPlayCid.value) {
+            currentEpisodeIndex = i;
             episodes = episodesList;
             continue;
           }
@@ -644,6 +646,7 @@ class VideoIntroController extends GetxController {
         sheetHeight: Get.size.height,
         isFullScreen: true,
         ugcSeason: ugcSeason,
+        currentEpisodeIndex: currentEpisodeIndex,
         changeFucCall: (item, index) {
           if (dataType == VideoEpidoesType.videoEpisode) {
             changeSeasonOrbangu(

lib/pages/video/detail/introduction/widgets/season_panel.dart

@@ -42,23 +42,14 @@ class _SeasonPanelState extends State<SeasonPanel> {
     _videoDetailController = Get.find<VideoDetailController>(tag: heroTag);
 
     /// 根据 cid 找到对应集，找到对应 episodes
-    final List<SectionItem> sections = widget.ugcSeason.sections!;
+    getCurrentEpisodeIndex();
-    for (int i = 0; i < sections.length; i++) {
-      final List<EpisodeItem> episodesList = sections[i].episodes!;
-      for (int j = 0; j < episodesList.length; j++) {
-        if (episodesList[j].cid == cid) {
-          currentEpisodeIndex = i;
-          episodes = episodesList;
-          continue;
-        }
-      }
-    }
 
     /// 取对应 season_id 的 episodes
     getCurrentIndex();
     _videoDetailController.cid.listen((int p0) {
       cid = p0;
       getCurrentIndex();
+      getCurrentEpisodeIndex();
     });
   }
 
@@ -94,6 +85,21 @@ class _SeasonPanelState extends State<SeasonPanel> {
     }
   }
 
+  // 获取currentEpisodeIndex
+  void getCurrentEpisodeIndex() {
+    final List<SectionItem> sections = widget.ugcSeason.sections!;
+    for (int i = 0; i < sections.length; i++) {
+      final List<EpisodeItem> episodesList = sections[i].episodes!;
+      for (int j = 0; j < episodesList.length; j++) {
+        if (episodesList[j].cid == cid) {
+          currentEpisodeIndex = i;
+          episodes = episodesList;
+          continue;
+        }
+      }
+    }
+  }
+
   Widget buildEpisodeListItem(
     EpisodeItem episode,
     int index,