diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index aed7611..d356de5 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -614,7 +614,7 @@ "languageVersion": "2.1" } ], - "generated": "2020-09-30T08:56:02.620599Z", + "generated": "2020-09-30T09:06:30.237124Z", "generator": "pub", "generatorVersion": "2.7.2" } diff --git a/assets/images/launch_image/launch_image.png b/assets/images/launch_image/launch_image.png old mode 100755 new mode 100644 index 939b61e..0379b82 Binary files a/assets/images/launch_image/launch_image.png and b/assets/images/launch_image/launch_image.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/Contents.json b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/Contents.json index 3a0122d..bcbe349 100644 --- a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/Contents.json +++ b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/Contents.json @@ -33,7 +33,7 @@ { "size" : "40x40", "idiom" : "iphone", - "filename" : "icon-40@2x.png", + "filename" : "icon-40@2x-1.png", "scale" : "2x" }, { @@ -57,25 +57,25 @@ { "size" : "20x20", "idiom" : "ipad", - "filename" : "icon-20-ipad.png", + "filename" : "icon-20.png", "scale" : "1x" }, { "size" : "20x20", "idiom" : "ipad", - "filename" : "icon-20@2x-ipad.png", + "filename" : "icon-20@2x-1.png", "scale" : "2x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "icon-29-ipad.png", + "filename" : "icon-30.png", "scale" : "1x" }, { "size" : "29x29", "idiom" : "ipad", - "filename" : "icon-29@2x-ipad.png", + "filename" : "icon-29@2x-1.png", "scale" : "2x" }, { @@ -111,7 +111,7 @@ { "size" : "1024x1024", "idiom" : "ios-marketing", - "filename" : "icon-1024.png", + "filename" : "iTunesArtwork@2x.png", "scale" : "1x" } ], diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png new file mode 100644 index 0000000..71e96b8 Binary files /dev/null and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-1024.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-1024.png deleted file mode 100644 index 9da3bab..0000000 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-1024.png and /dev/null differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20-ipad.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20-ipad.png deleted file mode 100644 index d953b16..0000000 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20-ipad.png and /dev/null differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20.png new file mode 100644 index 0000000..baf871d Binary files /dev/null and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x-1.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x-1.png new file mode 100644 index 0000000..d336660 Binary files /dev/null and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x-1.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png deleted file mode 100644 index 61e01af..0000000 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png and /dev/null differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x.png index 61e01af..d336660 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@2x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@3x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@3x.png index 950325e..ea9f294 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@3x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-20@3x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29-ipad.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29-ipad.png deleted file mode 100644 index 2c5ab67..0000000 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29-ipad.png and /dev/null differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29.png index 2c5ab67..f055bfa 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x-1.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x-1.png new file mode 100644 index 0000000..2402ea0 Binary files /dev/null and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x-1.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png deleted file mode 100644 index 9ed7580..0000000 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png and /dev/null differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x.png index 9ed7580..2402ea0 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@2x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@3x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@3x.png index c30e547..58410cd 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@3x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-29@3x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-30.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-30.png new file mode 100644 index 0000000..f055bfa Binary files /dev/null and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-30.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40.png index 61e01af..d336660 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@2x-1.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@2x-1.png new file mode 100644 index 0000000..f96b4ec Binary files /dev/null and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@2x-1.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@2x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@2x.png index 5f4cf8f..f96b4ec 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@2x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@2x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@3x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@3x.png index 3e479dd..1d08fd1 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@3x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-40@3x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-60@2x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-60@2x.png index 3e479dd..1d08fd1 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-60@2x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-60@2x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-60@3x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-60@3x.png index f621b3b..34b6aa2 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-60@3x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-60@3x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-76.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-76.png index a5c92e4..9aa93ad 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-76.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-76.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-76@2x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-76@2x.png index d7a8448..2ed3a8f 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-76@2x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-76@2x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-83.5@2x.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-83.5@2x.png index 006d760..284d436 100644 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-83.5@2x.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/AppIcon.appiconset/icon-83.5@2x.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/1125x2436.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/1125x2436.png old mode 100755 new mode 100644 index 7c7c2a3..0379b82 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/1125x2436.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/1125x2436.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/1242x2208.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/1242x2208.png old mode 100755 new mode 100644 index 939b61e..e8cd3e7 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/1242x2208.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/1242x2208.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/640x1136.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/640x1136.png old mode 100755 new mode 100644 index 3a14c39..206fb43 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/640x1136.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/640x1136.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/640x960.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/640x960.png old mode 100755 new mode 100644 index 1021a24..85427e7 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/640x960.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/640x960.png differ diff --git a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/750x1334.png b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/750x1334.png old mode 100755 new mode 100644 index ea80ec5..ecc6030 Binary files a/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/750x1334.png and b/example/ios/Runner/项目资源/智莺生活/image/智莺生活.xcassets/LaunchImage.launchimage/750x1334.png differ diff --git a/lib/pages/goods_details_page/goods_details_page.dart b/lib/pages/goods_details_page/goods_details_page.dart index a0579c1..173cad3 100644 --- a/lib/pages/goods_details_page/goods_details_page.dart +++ b/lib/pages/goods_details_page/goods_details_page.dart @@ -56,7 +56,8 @@ class GoodsDetailsContainer extends StatefulWidget { class _GoodsDetailsContainerState extends State { bool _isEnded = false; ScrollController _controller = ScrollController(); - RefreshController _refreshController = RefreshController(initialRefresh: false); + RefreshController _refreshController = + RefreshController(initialRefresh: false); void _onLoading() async { // await Future.delayed(Duration(milliseconds: 1000)); @@ -133,12 +134,16 @@ class _GoodsDetailsContainerState extends State { return Scaffold( backgroundColor: Colors.white, body: Container( - color: Color(0xfff1f1f1), - child: CustomScrollView( - controller: _controller, - slivers: _createContent(context, datas ?? []), - ), - ), + color: Color(0xfff1f1f1), + child: Stack( + children: [ + CustomScrollView( + controller: _controller, + slivers: _createContent(context, datas ?? []), + ), + _getAppBarWidget(), + ], + )), /// appBar // Align(alignment: Alignment.topCenter, child: _getAppBarWidget()), diff --git a/lib/pages/launch_page/launch_page.dart b/lib/pages/launch_page/launch_page.dart index 125f7ad..0c085bf 100644 --- a/lib/pages/launch_page/launch_page.dart +++ b/lib/pages/launch_page/launch_page.dart @@ -48,6 +48,7 @@ class _LaunchPageState extends State { return Image.asset( 'assets/images/launch_image/launch_image.png', package: 'zhiying_base_widget', + fit: BoxFit.cover, ); } } diff --git a/lib/register.dart b/lib/register.dart index 4006454..098033e 100644 --- a/lib/register.dart +++ b/lib/register.dart @@ -22,7 +22,6 @@ import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/goods_det import 'package:zhiying_base_widget/widgets/goods_details/store/store_widget.dart'; import 'package:zhiying_base_widget/widgets/goods_details/upgrade_tip/upgrade_tip_widget.dart'; import 'package:zhiying_base_widget/widgets/home/home_banner/home_banner_creater.dart'; -import 'package:zhiying_base_widget/widgets/home/home_banner/home_banner_widget.dart'; import 'package:zhiying_base_widget/widgets/home/home_goods/home_goods_creater.dart'; import 'package:zhiying_base_widget/widgets/home/home_notice/home_notice_widget.dart'; import 'package:zhiying_base_widget/widgets/home/home_slide_banner/home_slide_banner_creater.dart'; @@ -84,6 +83,10 @@ class BaseWidgetRegister { register.setupQQ("1111030588", "XoHKlrBybXy7ORBt"); SharesdkPlugin.regist(register); }); + + Application.addMethod(() async { + return Future.delayed(Duration(seconds: 2)); + }); } // 注册页面 @@ -269,8 +272,7 @@ class BaseWidgetRegister { WidgetFactory.regist('profile_my_functions', DefaultWidgetCreater((model) => MineQuickEntry(model))); // WidgetFactory.regist('profile_carousel', DefaultWidgetCreater((model) => HomeBannerWidget(model))); - WidgetFactory.regist('profile_carousel', - DefaultWidgetCreater((model) => HomeBannerWidget(model))); + // WidgetFactory.regist('profile_carousel', HomeBannerCreater()); // ==================== 钱包 WidgetFactory.regist( diff --git a/lib/widgets/home/home_slide_banner/home_slide_banner.dart b/lib/widgets/home/home_slide_banner/home_slide_banner.dart index 24a51cf..6965548 100644 --- a/lib/widgets/home/home_slide_banner/home_slide_banner.dart +++ b/lib/widgets/home/home_slide_banner/home_slide_banner.dart @@ -1,10 +1,9 @@ +import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:provider/provider.dart'; -import 'package:zhiying_base_widget/pages/goods_details_page/goods_details_page.dart'; import 'package:zhiying_base_widget/pages/main_page/notifier/main_page_bg_notifier.dart'; -import 'package:cached_network_image/cached_network_image.dart'; import 'package:zhiying_comm/zhiying_comm.dart'; import 'bloc/bloc.dart'; @@ -28,7 +27,9 @@ class _HomeSlideBannerState extends State { @override Widget build(BuildContext context) { return BlocProvider( - create: (_) => HomeSlideBannerBloc(repository: HomeSlideBannerRepository())..add(HomeBannerInitEvent(model: widget?.model)), + create: (_) => + HomeSlideBannerBloc(repository: HomeSlideBannerRepository()) + ..add(HomeBannerInitEvent(model: widget?.model)), child: HomeSlideBannerContainer(), ); } @@ -36,11 +37,11 @@ class _HomeSlideBannerState extends State { class HomeSlideBannerContainer extends StatefulWidget { @override - _HomeSlideBannerContainerState createState() => _HomeSlideBannerContainerState(); + _HomeSlideBannerContainerState createState() => + _HomeSlideBannerContainerState(); } class _HomeSlideBannerContainerState extends State { - /// 子元素点击事件 void _itemOnClick(IndexCarousel model) { print('点击了 $model'); @@ -80,7 +81,17 @@ class _HomeSlideBannerContainerState extends State { } Widget _getMainWidget(HomeSlideBannerModel datas) { + Future.delayed(Duration.zero, () { + Provider.of(context, listen: false) + .switchBg(Container( + width: double.infinity, + height: 200, + color: Colors.redAccent, + )); + }); + return Container( + margin: EdgeInsets.all(10), width: double.infinity, height: 140, child: Swiper( @@ -98,13 +109,15 @@ class _HomeSlideBannerContainerState extends State { loop: true, autoplay: true, onTap: (index) => _itemOnClick(datas.index_carousel_list[index]), - pagination: _getSwiperStyleByType(datas, datas?.index_carousel_list?.length ?? 0), + pagination: _getSwiperStyleByType( + datas, datas?.index_carousel_list?.length ?? 0), onIndexChanged: (index) { //print('切换下一页'); - Provider.of(context, listen: false).switchBg(Container( + Provider.of(context, listen: false) + .switchBg(Container( width: double.infinity, height: 200, - color: Colors.primaries[(index + 2) % Colors.primaries.length], + color: Colors.redAccent, )); }, ), @@ -112,50 +125,71 @@ class _HomeSlideBannerContainerState extends State { } /// 获取进度样式 - SwiperPlugin _getSwiperStyleByType(HomeSlideBannerModel model, int pageCount) { - - if('1' != model.pagination_open){ + SwiperPlugin _getSwiperStyleByType( + HomeSlideBannerModel model, int pageCount) { + if ('1' != model.pagination_open) { return null; } if ('type_number' == model.pagination) { - return _getNumswiperPlugin(pageCount, model.pagination_select_color, model.pagination_unselect_color); + return _getNumswiperPlugin(pageCount, model.pagination_select_color, + model.pagination_unselect_color); } if ('type_point' == model.pagination) { - return _swiperCustomPaginationDito(pageCount, model.pagination_select_color, model.pagination_unselect_color); + return _swiperCustomPaginationDito(pageCount, + model.pagination_select_color, model.pagination_unselect_color); } if ('type_bar' == model.pagination) { - return _swiperCustomPagination(pageCount, model.pagination_select_color, model.pagination_unselect_color); + return _swiperCustomPagination(pageCount, model.pagination_select_color, + model.pagination_unselect_color); } return null; } /// 数字样式 - SwiperPlugin _getNumswiperPlugin(int pageCount, String selectColor, String unselectColor) { - return SwiperCustomPagination(builder: (BuildContext context, SwiperPluginConfig config) { + SwiperPlugin _getNumswiperPlugin( + int pageCount, String selectColor, String unselectColor) { + return SwiperCustomPagination( + builder: (BuildContext context, SwiperPluginConfig config) { return Align( alignment: Alignment(0.0, 0.9), child: Container( padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 18), - decoration: BoxDecoration(borderRadius: BorderRadius.circular(13), color: HexColor.fromHex('#4D000000')), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(13), + color: HexColor.fromHex('#4D000000')), child: RichText( - text: TextSpan(text: '${config.activeIndex + 1}', style: TextStyle(fontSize: 12, color: HexColor.fromHex(selectColor)), children: [ - TextSpan(text: '/', style: TextStyle(fontSize: 12, color: HexColor.fromHex(unselectColor))), - TextSpan(text: '$pageCount', style: TextStyle(fontSize: 12, color: HexColor.fromHex(unselectColor))), - ]), + text: TextSpan( + text: '${config.activeIndex + 1}', + style: TextStyle( + fontSize: 12, color: HexColor.fromHex(selectColor)), + children: [ + TextSpan( + text: '/', + style: TextStyle( + fontSize: 12, + color: HexColor.fromHex(unselectColor))), + TextSpan( + text: '$pageCount', + style: TextStyle( + fontSize: 12, + color: HexColor.fromHex(unselectColor))), + ]), )), ); }); } /// 自定义进度条 - SwiperPlugin _swiperCustomPagination(int pageCount, String selectColor, String unselectColor) { + SwiperPlugin _swiperCustomPagination( + int pageCount, String selectColor, String unselectColor) { List list = []; for (int i = 0; i < pageCount; i++) { list.add(i); } - return SwiperCustomPagination(builder: (BuildContext context, SwiperPluginConfig config) { + return SwiperCustomPagination( + builder: (BuildContext context, SwiperPluginConfig config) { return Align( alignment: Alignment(0.0, 0.9), child: Row( @@ -164,10 +198,13 @@ class _HomeSlideBannerContainerState extends State { children: list.map((index) { var borderRadius; if (index == 0) { - borderRadius = BorderRadius.only(topLeft: Radius.circular(2), bottomLeft: Radius.circular(2)); + borderRadius = BorderRadius.only( + topLeft: Radius.circular(2), bottomLeft: Radius.circular(2)); } if (index == list.length - 1) { - borderRadius = BorderRadius.only(topRight: Radius.circular(2), bottomRight: Radius.circular(2)); + borderRadius = BorderRadius.only( + topRight: Radius.circular(2), + bottomRight: Radius.circular(2)); } if (index == config.activeIndex) { @@ -177,7 +214,11 @@ class _HomeSlideBannerContainerState extends State { return Container( height: 4, width: 25, - decoration: BoxDecoration(borderRadius: borderRadius, color: index == config.activeIndex ? HexColor.fromHex(selectColor) : HexColor.fromHex(unselectColor)), + decoration: BoxDecoration( + borderRadius: borderRadius, + color: index == config.activeIndex + ? HexColor.fromHex(selectColor) + : HexColor.fromHex(unselectColor)), ); }).toList(), ), @@ -186,7 +227,14 @@ class _HomeSlideBannerContainerState extends State { } /// 圆形进度条 - SwiperPlugin _swiperCustomPaginationDito(int pageCount, String selectColor, String unselectColor) { - return SwiperPagination(margin: const EdgeInsets.only(), builder: DotSwiperPaginationBuilder( color: HexColor.fromHex(unselectColor), activeColor: HexColor.fromHex(selectColor), size: 8, activeSize: 8)); + SwiperPlugin _swiperCustomPaginationDito( + int pageCount, String selectColor, String unselectColor) { + return SwiperPagination( + margin: const EdgeInsets.only(), + builder: DotSwiperPaginationBuilder( + color: HexColor.fromHex(unselectColor), + activeColor: HexColor.fromHex(selectColor), + size: 8, + activeSize: 8)); } }