Merge remote-tracking branch 'origin/1.22.0_master' into 1.22.0_master

lib/widgets/custom/share_content/share_content_widget.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:zhiying_base_widget/widgets/custom/multi_nav/cached_network_image_util.dart';
 import 'package:zhiying_base_widget/widgets/custom/share_content/model/custom_share_content_model.dart';
 import 'package:zhiying_base_widget/widgets/custom/share_content/share_content_sk.dart';
 import 'package:zhiying_base_widget/widgets/share/models/share_alert_model.dart';
@@ -90,40 +91,37 @@ class _CustomShareContentContainerWidgetState extends State<_CustomShareContentC
             topLeft: Radius.circular(ParseUtil.stringParseDouble(model?.topLeftRadius)),
             topRight: Radius.circular(ParseUtil.stringParseDouble(model?.topRightRadius)),
           )),
-      child: Container(
-        padding: const EdgeInsets.only(left: 12, right: 12, top: 12, bottom: 14),
-        height: 200,
-        width: double.infinity,
-        decoration: BoxDecoration(
-          image: DecorationImage(
-            image: CachedNetworkImageProvider(model?.bgImageUrl ?? '')
-          )
-        ),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            // 标题
-            CachedNetworkImage(imageUrl: model?.titleImageUrl, width: 90,),
-            // SizedBox(height: 20),
-            // 文案
-            Text(model?.text?? '', style: TextStyle(color: HexColor.fromHex(model?.textColor), fontSize: 15),),
-            // SizedBox(height: 22),
-            // 复制按钮 or 分享 按钮
-            Visibility(
-              visible: (model?.isShowShareFriend ?? '0') == '1',
-                // 仅仅复制按钮
-                replacement: GestureDetector( onTap: () => _clickCopyButton(model?.text) ,child: CachedNetworkImage(imageUrl: model?.copyLongImageUrl ?? '', width: double.infinity)),
-                child: Row(
-                  children: [
-                    // 复制按钮
-                    Flexible(flex: 1, child: GestureDetector(onTap: () => _clickCopyButton(model?.text),child: CachedNetworkImage(imageUrl: model?.copyImageUrl, width: double.infinity,))),
-                    SizedBox(width: 20),
-                    // 分享按钮
-                    Flexible(flex: 1,child: GestureDetector(onTap: ()=> _clickShareButton(model?.text), child: CachedNetworkImage(imageUrl: model?.shareImageUrl, width: double.infinity,)))
-                  ],
-                ))
-          ],
-        ),
+      child: Stack(
+        children: [
+          CachedNetworkImage(imageUrl: model?.bgImageUrl ?? '', width: double.infinity),
+          Padding(
+            padding: const EdgeInsets.only(left: 12.5, right: 12.5, top: 12.5, bottom: 14),
+            child: Column(
+              children: [
+                // 标题
+                CachedNetworkImage(imageUrl: model?.titleImageUrl, width: 90,),
+                SizedBox(height: 20),
+                // 文案
+                Text(model?.text?? '', style: TextStyle(color: HexColor.fromHex(model?.textColor), fontSize: 15), maxLines: 4, overflow:  TextOverflow.ellipsis,),
+                SizedBox(height: 22),
+                // 复制按钮 or 分享 按钮
+                Visibility(
+                  visible: (model?.isShowShareFriend ?? '0') == '1',
+                    // 仅仅复制按钮
+                    replacement: GestureDetector( onTap: () => _clickCopyButton(model?.text) ,child: CachedNetworkImage(imageUrl: model?.copyLongImageUrl ?? '', width: double.infinity)),
+                    child: Row(
+                      children: [
+                        // 复制按钮
+                        Flexible(flex: 1, child: GestureDetector(onTap: () => _clickCopyButton(model?.text),child: CachedNetworkImage(imageUrl: model?.copyImageUrl, width: double.infinity,))),
+                        SizedBox(width: 20),
+                        // 分享按钮
+                        Flexible(flex: 1,child: GestureDetector(onTap: ()=> _clickShareButton(model?.text), child: CachedNetworkImage(imageUrl: model?.shareImageUrl, width: double.infinity,)))
+                      ],
+                    ))
+              ],
+            ),
+          ),
+        ],
       )
     );
   }