opt: images showing

lib/pages/dynamics/widgets/pic_panel.dart

@@ -1,105 +1,25 @@
+import 'package:PiliPalaX/common/widgets/imageview.dart';
 import 'package:flutter/material.dart';
-import 'package:get/get.dart';
-import 'package:PiliPalaX/common/constants.dart';
-import 'package:PiliPalaX/common/widgets/badge.dart';
-import 'package:PiliPalaX/common/widgets/network_img_layer.dart';
-import 'package:PiliPalaX/pages/preview/index.dart';
 
 Widget picWidget(item, context) {
   String type = item.modules.moduleDynamic.major.type;
-  List pictures = [];
   if (type == 'MAJOR_TYPE_OPUS') {
     /// 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;
-  }
-  int len = pictures.length;
-  List<String> picList = [];
-  List<Widget> list = [];
-  for (var i = 0; i < len; i++) {
-    picList.add(pictures[i].src ?? pictures[i].url);
-    list.add(
-      LayoutBuilder(
-        builder: (context, BoxConstraints box) {
-          return GestureDetector(
-            onTap: () {
-              showDialog(
-                useSafeArea: false,
-                context: context,
-                builder: (context) {
-                  return ImagePreview(initialPage: i, imgList: picList);
-                },
-              );
-            },
-            child: NetworkImgLayer(
-              src: pictures[i].src ?? pictures[i].url,
-              width: box.maxWidth,
-              height: box.maxWidth,
-            ),
-            // ),
-          );
-        },
-      ),
-    );
-  }
   return LayoutBuilder(
-    builder: (context, BoxConstraints box) {
-      double maxWidth = box.maxWidth;
-      double aspectRatio = 1.0;
-      double origAspectRatio = 0.0;
-      double crossCount = 3;
-
-      double height = 0.0;
-      if (len == 1) {
-        try {
-          origAspectRatio =
-              aspectRatio = pictures.first.width / pictures.first.height;
-        } catch (_) {}
-        if (aspectRatio < 0.4) {
-          aspectRatio = 0.4;
-        }
-        if (origAspectRatio < 0.5 || pictures.first.width < 1920) {
-          crossCount = 2;
-          height = maxWidth / 2 / aspectRatio;
-        }
-      } else {
-        aspectRatio = 1;
-        height =
-            maxWidth / crossCount * ((len + crossCount - 1) ~/ crossCount) + 6;
-      }
-      return Container(
-        padding: const EdgeInsets.only(top: 4),
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.circular(StyleString.imgRadius.x),
-        ),
-        clipBehavior: Clip.hardEdge,
-        height: height,
-        child: Stack(
-          children: [
-            GridView.count(
-              padding: EdgeInsets.zero,
-              physics: const NeverScrollableScrollPhysics(),
-              crossAxisCount: crossCount.toInt(),
-              mainAxisSpacing: 4.0,
-              crossAxisSpacing: 4.0,
-              childAspectRatio: aspectRatio,
-              children: list,
+    builder: (_, constraints) => image(
+      constraints.maxWidth,
+      (item.modules.moduleDynamic.major.draw.items as List)
+          .map(
+            (item) => ImageModel(
+              width: item.width,
+              height: item.height,
+              url: item.url ?? '',
             ),
-            if (len == 1 && height > Get.size.height * 0.9)
-              const PBadge(
-                text: '长图',
-                top: null,
-                right: null,
-                bottom: 6.0,
-                left: 6.0,
-                type: 'gray',
-              )
-          ],
-        ),
-      );
-    },
+          )
+          .toList(),
+    ),
   );
 }