fix: 动态数据渲染异常

lib/pages/dynamics/widgets/content_panel.dart

@@ -28,6 +28,8 @@ Widget content(item, context, source) {
             focusNode: FocusNode(),
             selectionControls: MaterialTextSelectionControls(),
             child: Text.rich(
+              /// fix 默认20px高度
+              style: const TextStyle(height: 0),
               richNode(item, context),
               maxLines: source == 'detail' ? 999 : 3,
               overflow: TextOverflow.ellipsis,

lib/pages/dynamics/widgets/dynamic_panel.dart

@@ -41,7 +41,8 @@ class DynamicPanel extends StatelessWidget {
                 padding: const EdgeInsets.fromLTRB(12, 12, 12, 8),
                 child: author(item, context),
               ),
-              if (item!.modules!.moduleDynamic!.desc != null)
+              if (item!.modules!.moduleDynamic!.desc != null ||
+                  item!.modules!.moduleDynamic!.major != null)
                 content(item, context, source),
               forWard(item, context, _dynamicsController, source),
               const SizedBox(height: 2),

lib/pages/dynamics/widgets/forward_panel.dart

@@ -44,19 +44,21 @@ Widget forWard(item, context, ctr, source, {floor = 1}) {
               ],
             ),
             const SizedBox(height: 2),
-            if (item.modules.moduleDynamic.topic != null) ...[
+
-              Padding(
+            /// fix #话题跟content重复
-                padding: floor == 2
+            // if (item.modules.moduleDynamic.topic != null) ...[
-                    ? EdgeInsets.zero
+            //   Padding(
-                    : const EdgeInsets.only(left: 12, right: 12),
+            //     padding: floor == 2
-                child: GestureDetector(
+            //         ? EdgeInsets.zero
-                  child: Text(
+            //         : const EdgeInsets.only(left: 12, right: 12),
-                    '#${item.modules.moduleDynamic.topic.name}',
+            //     child: GestureDetector(
-                    style: authorStyle,
+            //       child: Text(
-                  ),
+            //         '#${item.modules.moduleDynamic.topic.name}',
-                ),
+            //         style: authorStyle,
-              ),
+            //       ),
-            ],
+            //     ),
+            //   ),
+            // ],
             Text.rich(
               richNode(item, context),
               // 被转发状态(floor=2) 隐藏
@@ -71,6 +73,8 @@ Widget forWard(item, context, ctr, source, {floor = 1}) {
                 : const EdgeInsets.only(left: 12, right: 12),
             child: picWidget(item, context),
           ),
+
+          /// 附加内容 商品信息、直播预约等等
           if (item.modules.moduleDynamic.additional != null)
             addWidget(
               item,

lib/pages/dynamics/widgets/pic_panel.dart

@@ -8,7 +8,9 @@ Widget picWidget(item, context) {
   String type = item.modules.moduleDynamic.major.type;
   List pictures = [];
   if (type == 'MAJOR_TYPE_OPUS') {
-    pictures = item.modules.moduleDynamic.major.opus.pics;
+    /// fix 图片跟rich_node_panel重复
+    // pictures = item.modules.moduleDynamic.major.opus.pics;
+    return const SizedBox();
   }
   if (type == 'MAJOR_TYPE_DRAW') {
     pictures = item.modules.moduleDynamic.major.draw.items;

lib/pages/dynamics/widgets/rich_node_panel.dart

@@ -1,13 +1,30 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:pilipala/common/widgets/network_img_layer.dart';
+import 'package:pilipala/models/dynamics/result.dart';
 
 // 富文本
 InlineSpan richNode(item, context) {
+  final spacer = _VerticalSpaceSpan(0.0);
+  try {
     TextStyle authorStyle =
         TextStyle(color: Theme.of(context).colorScheme.primary);
     List<InlineSpan> spanChilds = [];
-  for (var i in item.modules.moduleDynamic.desc.richTextNodes) {
+    String contentType = 'desc';
+
+    dynamic richTextNodes;
+    if (item.modules.moduleDynamic.desc != null) {
+      richTextNodes = item.modules.moduleDynamic.desc.richTextNodes;
+    } else if (item.modules.moduleDynamic.major != null) {
+      contentType = 'major';
+      // 动态页面 richTextNodes 层级可能与主页动态层级不同
+      richTextNodes =
+          item.modules.moduleDynamic.major.opus.summary.richTextNodes;
+    }
+    if (richTextNodes == null || richTextNodes.isEmpty) {
+      return spacer;
+    } else {
+      for (var i in richTextNodes) {
         if (i.type == 'RICH_TEXT_NODE_TYPE_TEXT') {
           spanChilds.add(
               TextSpan(text: i.origText, style: const TextStyle(height: 1.65)));
@@ -67,7 +84,11 @@ InlineSpan richNode(item, context) {
                 onTap: () {
                   Get.toNamed(
                     '/webview',
-                parameters: {'url': i.origText, 'type': 'url', 'pageTitle': ''},
+                    parameters: {
+                      'url': i.origText,
+                      'type': 'url',
+                      'pageTitle': ''
+                    },
                   );
                 },
                 child: Text(
@@ -169,7 +190,118 @@ InlineSpan richNode(item, context) {
           );
         }
       }
+      if (contentType == 'major' &&
+          item.modules.moduleDynamic.major.opus.pics.isNotEmpty) {
+        // 图片可能跟其他widget重复渲染
+        print('有图片');
+        List<OpusPicsModel> pics = item.modules.moduleDynamic.major.opus.pics;
+        int len = pics.length;
+        List picList = [];
+
+        if (len == 1) {
+          OpusPicsModel pictureItem = pics.first;
+          picList.add(pictureItem.url);
+          spanChilds.add(const TextSpan(text: '\n'));
+          spanChilds.add(
+            WidgetSpan(
+              child: LayoutBuilder(
+                builder: (context, BoxConstraints box) {
+                  return GestureDetector(
+                    onTap: () {
+                      Get.toNamed('/preview',
+                          arguments: {'initialPage': 0, 'imgList': picList});
+                    },
+                    child: Padding(
+                      padding: const EdgeInsets.only(top: 4),
+                      child: NetworkImgLayer(
+                        src: pictureItem.url,
+                        width: box.maxWidth / 2,
+                        height: box.maxWidth *
+                            0.5 *
+                            pictureItem.height! /
+                            pictureItem.width!,
+                      ),
+                    ),
+                  );
+                },
+              ),
+            ),
+          );
+        }
+        if (len > 1) {
+          List<Widget> list = [];
+          for (var i = 0; i < len; i++) {
+            picList.add(pics[i].url);
+            list.add(
+              LayoutBuilder(
+                builder: (context, BoxConstraints box) {
+                  return GestureDetector(
+                    onTap: () {
+                      Get.toNamed('/preview',
+                          arguments: {'initialPage': i, 'imgList': picList});
+                    },
+                    child: NetworkImgLayer(
+                      src: pics[i].url,
+                      width: box.maxWidth,
+                      height: box.maxWidth,
+                    ),
+                  );
+                },
+              ),
+            );
+          }
+          spanChilds.add(
+            WidgetSpan(
+              child: LayoutBuilder(
+                builder: (context, BoxConstraints box) {
+                  double maxWidth = box.maxWidth;
+                  double crossCount = len < 3 ? 2 : 3;
+                  double height = maxWidth /
+                          crossCount *
+                          (len % crossCount == 0
+                              ? len ~/ crossCount
+                              : len ~/ crossCount + 1) +
+                      6;
+                  return Container(
+                    padding: const EdgeInsets.only(top: 6),
+                    height: height,
+                    child: GridView.count(
+                      padding: EdgeInsets.zero,
+                      physics: const NeverScrollableScrollPhysics(),
+                      crossAxisCount: crossCount.toInt(),
+                      mainAxisSpacing: 4.0,
+                      crossAxisSpacing: 4.0,
+                      childAspectRatio: 1,
+                      children: list,
+                    ),
+                  );
+                },
+              ),
+            ),
+          );
+        }
+        // spanChilds.add(
+        //   WidgetSpan(
+        //     child: NetworkImgLayer(
+        //       src: pics.first.url,
+        //       type: 'emote',
+        //       width: 100,
+        //       height: 200,
+        //     ),
+        //   ),
+        // );
+      }
       return TextSpan(
         children: spanChilds,
       );
+    }
+  } catch (err) {
+    print('❌rich_node_panel err: $err');
+    return spacer;
+  }
+}
+
+class _VerticalSpaceSpan extends WidgetSpan {
+  _VerticalSpaceSpan(double height)
+      : super(child: SizedBox(height: height, width: double.infinity));
 }

lib/pages/dynamics/widgets/video_panel.dart

@@ -57,20 +57,21 @@ Widget videoSeasonWidget(item, context, type, {floor = 1}) {
         const SizedBox(height: 6),
       ],
       // const SizedBox(height: 4),
-      if (item.modules.moduleDynamic.topic != null) ...[
+      /// fix #话题跟content重复
-        Padding(
+      // if (item.modules.moduleDynamic.topic != null) ...[
-          padding: floor == 2
+      //   Padding(
-              ? EdgeInsets.zero
+      //     padding: floor == 2
-              : const EdgeInsets.only(left: 12, right: 12),
+      //         ? EdgeInsets.zero
-          child: GestureDetector(
+      //         : const EdgeInsets.only(left: 12, right: 12),
-            child: Text(
+      //     child: GestureDetector(
-              '#${item.modules.moduleDynamic.topic.name}',
+      //       child: Text(
-              style: authorStyle,
+      //         '#${item.modules.moduleDynamic.topic.name}',
-            ),
+      //         style: authorStyle,
-          ),
+      //       ),
-        ),
+      //     ),
-        const SizedBox(height: 6),
+      //   ),
-      ],
+      //   const SizedBox(height: 6),
+      // ],
       if (floor == 2 && item.modules.moduleDynamic.desc != null) ...[
         Text.rich(richNode(item, context)),
         const SizedBox(height: 6),