Merge branch 'main' into design

change_log/1.0.23.0504.md

@@ -0,0 +1,14 @@
+## 1.0.23
+
+### 功能
++ 封面下载
+
+  
+### 修复
++ 全屏问题
++ 视频播放器灰屏问题
++ 评论区点击区域问题
+
+
+更多更新日志可在Github上查看
+问题反馈、功能建议请查看「关于」页面。

lib/common/widgets/network_img_layer.dart

@@ -34,6 +34,9 @@ class NetworkImgLayer extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final int defaultImgQuality = GlobalData().imgQuality;
+    if (src == '' || src == null) {
+      return placeholder(context);
+    }
     final String imageUrl =
         '${src!.startsWith('//') ? 'https:${src!}' : src!}@${quality ?? defaultImgQuality}q.webp';
     int? memCacheWidth, memCacheHeight;

lib/pages/dynamics/detail/view.dart

@@ -196,7 +196,7 @@ class _DynamicDetailPageState extends State<DynamicDetailPage>
         centerTitle: false,
         titleSpacing: 0,
         title: StreamBuilder(
-          stream: titleStreamC.stream.distinct(),
+          stream: titleStreamC.stream,
           initialData: false,
           builder: (context, AsyncSnapshot snapshot) {
             return AnimatedOpacity(

lib/pages/dynamics/widgets/dynamic_panel.dart

@@ -1,14 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/pages/dynamics/index.dart';
-import '../../../models/dynamics/result.dart';
 import 'action_panel.dart';
 import 'author_panel.dart';
 import 'content_panel.dart';
 import 'forward_panel.dart';
 
 class DynamicPanel extends StatelessWidget {
-  final DynamicItemModel item;
+  final dynamic item;
   final String? source;
   DynamicPanel({required this.item, this.source, Key? key}) : super(key: key);
   final DynamicsController _dynamicsController = Get.put(DynamicsController());

lib/pages/dynamics/widgets/video_panel.dart

@@ -80,14 +80,11 @@ Widget videoSeasonWidget(item, context, type, {floor = 1}) {
         double width = box.maxWidth;
         return Stack(
           children: [
-            Hero(
-              tag: content.bvid,
-              child: NetworkImgLayer(
-                type: floor == 1 ? 'emote' : null,
-                width: width,
-                height: width / StyleString.aspectRatio,
-                src: content.cover,
-              ),
+            NetworkImgLayer(
+              type: floor == 1 ? 'emote' : null,
+              width: width,
+              height: width / StyleString.aspectRatio,
+              src: content.cover,
             ),
             if (content.badge != null && type == 'pgc')
               PBadge(

lib/pages/video/detail/view.dart

@@ -323,11 +323,13 @@ class _VideoDetailPageState extends State<VideoDetailPage>
       children: [
         GestureDetector(
           onTap: handlePlay,
-          child: Image.network(
-            vdCtr.videoItem['pic'],
-            width: Get.width,
-            height: videoHeight,
-            fit: BoxFit.cover, // 适应方式根据需要调整
+          child: Obx(
+            () => NetworkImgLayer(
+              src: vdCtr.cover.value,
+              width: Get.width,
+              height: videoHeight,
+              type: 'emote',
+            ),
           ),
         ),
         buildCustomAppBar(),

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.22+1022
+version: 1.0.23+1023
 
 environment:
   sdk: ">=3.0.0 <4.0.0"