From 14b573fe72a6506e1bd1230bcfb1e19f9c719403 Mon Sep 17 00:00:00 2001 From: PH2 <1293456824@qq.com> Date: Mon, 21 Sep 2020 10:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dart_tool/package_config.json | 234 +++++++++--------- .../example_lib_main_dart.xml | 6 - .idea/saveactions_settings.xml | 13 - android/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes android/gradlew | 160 ++++++++++++ android/gradlew.bat | 90 +++++++ example/ios/Podfile.lock | 2 +- .../bloc/goods_details_page_bloc.dart | 39 +++ .../bloc/goods_details_page_event.dart | 15 ++ .../bloc/goods_details_page_repository.dart | 40 +++ .../bloc/goods_details_page_state.dart | 24 ++ .../goods_details_page.dart | 193 +++++++++++++++ .../notifier/goods_details_page_notifier.dart | 16 ++ lib/register.dart | 92 ++++--- .../counpon_description_widget.dart | 61 +++++ .../goods_details/coupon/bloc/bloc.dart | 3 + .../coupon/bloc/counpon_bloc.dart | 30 +++ .../coupon/bloc/counpon_event.dart | 15 ++ .../coupon/bloc/counpon_repository.dart | 11 + .../coupon/bloc/counpon_state.dart | 25 ++ .../goods_details/coupon/counpon_sk.dart | 26 ++ .../goods_details/coupon/counpon_widget.dart | 104 ++++++++ .../coupon/model/counpon_model.dart | 2 + .../evaluate/godds_details_evaluate_sk.dart | 27 ++ .../goods_details_evaluate_widget.dart | 38 +++ .../footer/goods_details_footer_sk.dart | 38 +++ .../footer/goods_details_footer_widget.dart | 169 +++++++++++++ .../price/goods_details_price_widget.dart | 83 +++++++ .../bloc/goods_details_slide_banner_bloc.dart | 46 ++++ .../goods_details_slide_banner_event.dart | 15 ++ ...goods_details_slide_banner_repository.dart | 21 ++ .../goods_details_slide_banner_state.dart | 26 ++ .../goods_details_slide_banner_creater.dart | 19 ++ .../goods_details_slide_banner_sk.dart | 21 ++ .../goods_details_slide_banner_widget.dart | 172 +++++++++++++ .../goods_details_silde_banner_model.dart | 61 +++++ .../goods_details/store/bloc/bloc.dart | 4 + .../goods_details/store/bloc/store_bloc.dart | 43 ++++ .../goods_details/store/bloc/store_event.dart | 11 + .../store/bloc/store_repository.dart | 10 + .../goods_details/store/bloc/store_state.dart | 27 ++ .../store/model/store_model.dart | 3 + lib/widgets/goods_details/store/store_sk.dart | 44 ++++ .../goods_details/store/store_widget.dart | 147 +++++++++++ .../title/goods_details_title_widget.dart | 48 ++++ .../upgrade_tip/model/upgrade_tip_model.dart | 3 + .../upgrade_tip/upgrade_tip_sk.dart | 27 ++ .../upgrade_tip/upgrade_tip_widget.dart | 57 +++++ .../home/home_ai_dialog/home_ai_dialog.dart | 9 + .../home/home_banner/home_banner_widget.dart | 1 + lib/widgets/home/home_notice/bloc/bloc.dart | 3 + .../home_notice/bloc/home_notice_bloc.dart | 32 +++ .../home_notice/bloc/home_notice_event.dart | 16 ++ .../bloc/home_notice_repository.dart | 18 ++ .../home_notice/bloc/home_notice_state.dart | 30 +++ .../home/home_notice/home_notice_sk.dart | 28 +++ .../home/home_notice/home_notice_widget.dart | 203 +++++++++++++++ .../home_notice/model/home_notice_model.dart | 58 +++++ .../home_quick_entry/home_quick_entry.dart | 6 +- .../bloc/home_slide_banner_bloc.dart | 17 +- .../bloc/home_slide_banner_repository.dart | 29 ++- .../bloc/home_slide_banner_state.dart | 7 +- .../home_slide_banner/home_slide_banner.dart | 70 +++++- .../model/home_slide_banner_model.dart | 151 ++++------- .../home/home_sreach/home_sreach_creater.dart | 22 ++ .../home/home_sreach/home_sreach_sk.dart | 21 ++ .../home/home_sreach/home_sreach_widget.dart | 119 +++++++++ 67 files changed, 2896 insertions(+), 305 deletions(-) delete mode 100644 .idea/runConfigurations/example_lib_main_dart.xml delete mode 100644 .idea/saveactions_settings.xml create mode 100644 android/gradle/wrapper/gradle-wrapper.jar create mode 100755 android/gradlew create mode 100644 android/gradlew.bat create mode 100644 lib/pages/goods_details_page/bloc/goods_details_page_bloc.dart create mode 100644 lib/pages/goods_details_page/bloc/goods_details_page_event.dart create mode 100644 lib/pages/goods_details_page/bloc/goods_details_page_repository.dart create mode 100644 lib/pages/goods_details_page/bloc/goods_details_page_state.dart create mode 100644 lib/pages/goods_details_page/goods_details_page.dart create mode 100644 lib/pages/goods_details_page/notifier/goods_details_page_notifier.dart create mode 100644 lib/widgets/goods_details/counpon_description/counpon_description_widget.dart create mode 100644 lib/widgets/goods_details/coupon/bloc/bloc.dart create mode 100644 lib/widgets/goods_details/coupon/bloc/counpon_bloc.dart create mode 100644 lib/widgets/goods_details/coupon/bloc/counpon_event.dart create mode 100644 lib/widgets/goods_details/coupon/bloc/counpon_repository.dart create mode 100644 lib/widgets/goods_details/coupon/bloc/counpon_state.dart create mode 100644 lib/widgets/goods_details/coupon/counpon_sk.dart create mode 100644 lib/widgets/goods_details/coupon/counpon_widget.dart create mode 100644 lib/widgets/goods_details/coupon/model/counpon_model.dart create mode 100644 lib/widgets/goods_details/evaluate/godds_details_evaluate_sk.dart create mode 100644 lib/widgets/goods_details/evaluate/goods_details_evaluate_widget.dart create mode 100644 lib/widgets/goods_details/footer/goods_details_footer_sk.dart create mode 100644 lib/widgets/goods_details/footer/goods_details_footer_widget.dart create mode 100644 lib/widgets/goods_details/price/goods_details_price_widget.dart create mode 100644 lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_bloc.dart create mode 100644 lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_event.dart create mode 100644 lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_repository.dart create mode 100644 lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_state.dart create mode 100644 lib/widgets/goods_details/slide_banner/goods_details_slide_banner_creater.dart create mode 100644 lib/widgets/goods_details/slide_banner/goods_details_slide_banner_sk.dart create mode 100644 lib/widgets/goods_details/slide_banner/goods_details_slide_banner_widget.dart create mode 100644 lib/widgets/goods_details/slide_banner/model/goods_details_silde_banner_model.dart create mode 100644 lib/widgets/goods_details/store/bloc/bloc.dart create mode 100644 lib/widgets/goods_details/store/bloc/store_bloc.dart create mode 100644 lib/widgets/goods_details/store/bloc/store_event.dart create mode 100644 lib/widgets/goods_details/store/bloc/store_repository.dart create mode 100644 lib/widgets/goods_details/store/bloc/store_state.dart create mode 100644 lib/widgets/goods_details/store/model/store_model.dart create mode 100644 lib/widgets/goods_details/store/store_sk.dart create mode 100644 lib/widgets/goods_details/store/store_widget.dart create mode 100644 lib/widgets/goods_details/title/goods_details_title_widget.dart create mode 100644 lib/widgets/goods_details/upgrade_tip/model/upgrade_tip_model.dart create mode 100644 lib/widgets/goods_details/upgrade_tip/upgrade_tip_sk.dart create mode 100644 lib/widgets/goods_details/upgrade_tip/upgrade_tip_widget.dart create mode 100644 lib/widgets/home/home_ai_dialog/home_ai_dialog.dart create mode 100644 lib/widgets/home/home_notice/bloc/bloc.dart create mode 100644 lib/widgets/home/home_notice/bloc/home_notice_bloc.dart create mode 100644 lib/widgets/home/home_notice/bloc/home_notice_event.dart create mode 100644 lib/widgets/home/home_notice/bloc/home_notice_repository.dart create mode 100644 lib/widgets/home/home_notice/bloc/home_notice_state.dart create mode 100644 lib/widgets/home/home_notice/home_notice_sk.dart create mode 100644 lib/widgets/home/home_notice/home_notice_widget.dart create mode 100644 lib/widgets/home/home_notice/model/home_notice_model.dart create mode 100644 lib/widgets/home/home_sreach/home_sreach_creater.dart create mode 100644 lib/widgets/home/home_sreach/home_sreach_sk.dart create mode 100644 lib/widgets/home/home_sreach/home_sreach_widget.dart diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index 594b302..fd5afb4 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -3,697 +3,697 @@ "packages": [ { "name": "_fe_analyzer_shared", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/_fe_analyzer_shared-6.0.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/_fe_analyzer_shared-6.0.0", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "analyzer", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/analyzer-0.39.14", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/analyzer-0.39.14", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "archive", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.11", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.11", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "args", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/args-1.5.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/args-1.5.2", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "async", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/async-2.4.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.4.0", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "bloc", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/bloc-4.0.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/bloc-4.0.0", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "boolean_selector", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-1.0.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-1.0.5", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "build", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/build-1.3.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build-1.3.0", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "build_config", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/build_config-0.4.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_config-0.4.2", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "build_daemon", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/build_daemon-2.1.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_daemon-2.1.4", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "build_resolvers", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/build_resolvers-1.3.11", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_resolvers-1.3.11", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "build_runner", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/build_runner-1.10.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_runner-1.10.1", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "build_runner_core", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/build_runner_core-6.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/build_runner_core-6.0.1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "built_collection", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/built_collection-4.3.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/built_collection-4.3.2", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "built_value", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/built_value-7.1.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/built_value-7.1.0", "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "cached_network_image", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/cached_network_image-2.2.0+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/cached_network_image-2.2.0+1", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "charcode", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/charcode-1.1.2", "packageUri": "lib/", "languageVersion": "1.0" }, { "name": "checked_yaml", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/checked_yaml-1.0.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/checked_yaml-1.0.2", "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "cli_util", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/cli_util-0.1.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/cli_util-0.1.4", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "clock", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/clock-1.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/clock-1.0.1", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "code_builder", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/code_builder-3.4.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/code_builder-3.4.1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "collection", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.11", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/collection-1.14.11", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "convert", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/convert-2.1.1", "packageUri": "lib/", "languageVersion": "1.17" }, { "name": "crypto", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/crypto-2.1.3", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "csslib", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/csslib-0.16.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/csslib-0.16.2", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "dart_style", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/dart_style-1.3.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/dart_style-1.3.6", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "device_info", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+7", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+7", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "device_info_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/device_info_platform_interface-1.0.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info_platform_interface-1.0.1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "dio", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/dio-3.0.10", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio-3.0.10", "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "equatable", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/equatable-1.2.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/equatable-1.2.5", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "event_bus", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/event_bus-1.1.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/event_bus-1.1.1", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "file", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/file-5.2.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/file-5.2.1", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "fixnum", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/fixnum-0.10.11", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fixnum-0.10.11", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "flutter", - "rootUri": "file:///Users/fnuser/Documents/flutter-sdk/packages/flutter", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/packages/flutter", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "flutter_bloc", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_bloc-4.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_bloc-4.0.1", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "flutter_cache_manager", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-1.4.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cache_manager-1.4.2", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "flutter_cupertino_date_picker", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_cupertino_date_picker-1.0.26+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_cupertino_date_picker-1.0.26+2", "packageUri": "lib/", "languageVersion": "1.19" }, { "name": "flutter_native_image", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+2", "packageUri": "lib/", "languageVersion": "1.19" }, { "name": "flutter_page_indicator", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_page_indicator-0.0.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_page_indicator-0.0.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "flutter_plugin_android_lifecycle", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_plugin_android_lifecycle-1.0.9", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_plugin_android_lifecycle-1.0.9", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "flutter_screenutil", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_screenutil-1.1.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_screenutil-1.1.0", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "flutter_swiper", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/flutter_swiper-1.1.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_swiper-1.1.6", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "flutter_test", - "rootUri": "file:///Users/fnuser/Documents/flutter-sdk/packages/flutter_test", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/packages/flutter_test", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "flutter_web_plugins", - "rootUri": "file:///Users/fnuser/Documents/flutter-sdk/packages/flutter_web_plugins", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/packages/flutter_web_plugins", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "fluttertoast", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "glob", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/glob-1.2.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/glob-1.2.0", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "graphs", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/graphs-0.2.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/graphs-0.2.0", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "html", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/html-0.14.0+3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/html-0.14.0+3", "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "http", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/http-0.12.2", "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "http_multi_server", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/http_multi_server-2.2.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_multi_server-2.2.0", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "http_parser", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/http_parser-3.1.4", "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "image", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image-2.1.4", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "image_cropper", - "rootUri": "file:///Users/fnuser/.pub-cache/git/Image_Cropper-e32f2264f86a27a2f5d7a7a5e26c6154eaf5798e/", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/git/Image_Cropper-e32f2264f86a27a2f5d7a7a5e26c6154eaf5798e/", "packageUri": "lib/", "languageVersion": "1.20" }, { "name": "image_picker", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.6.7+7", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker-0.6.7+7", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "image_picker_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/image_picker_platform_interface-1.1.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/image_picker_platform_interface-1.1.0", "packageUri": "lib/", "languageVersion": "2.5" }, { "name": "intl", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/intl-0.16.1", "packageUri": "lib/", "languageVersion": "2.5" }, { "name": "io", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/io-0.3.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/io-0.3.4", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "js", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/js-0.6.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/js-0.6.2", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "json_annotation", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/json_annotation-3.0.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/json_annotation-3.0.1", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "json_serializable", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/json_serializable-3.4.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/json_serializable-3.4.1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "logging", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/logging-0.11.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/logging-0.11.4", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "matcher", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/matcher-0.12.6", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "meta", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.8", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/meta-1.1.8", "packageUri": "lib/", "languageVersion": "1.12" }, { "name": "mime", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/mime-0.9.7", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/mime-0.9.7", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "nested", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/nested-0.0.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/nested-0.0.4", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "node_interop", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/node_interop-1.1.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/node_interop-1.1.1", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "node_io", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/node_io-1.1.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/node_io-1.1.1", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "package_config", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/package_config-1.9.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_config-1.9.3", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "package_info", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path-1.6.4", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "path_provider", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.14", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.14", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_linux", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_macos", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+3", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "path_provider_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/path_provider_platform_interface-1.0.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_platform_interface-1.0.3", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "pedantic", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.8.0+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pedantic-1.8.0+1", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "petitparser", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/petitparser-2.4.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/petitparser-2.4.0", "packageUri": "lib/", "languageVersion": "2.4" }, { "name": "platform", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/platform-2.2.1", "packageUri": "lib/", "languageVersion": "1.24" }, { "name": "plugin_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/plugin_platform_interface-1.0.2", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "pool", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/pool-1.4.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pool-1.4.0", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "process", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/process-3.0.13", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/process-3.0.13", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "provider", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/provider-4.0.5+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/provider-4.0.5+1", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "pub_semver", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/pub_semver-1.4.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pub_semver-1.4.4", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "pubspec_parse", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/pubspec_parse-0.1.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pubspec_parse-0.1.5", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "pull_to_refresh", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/pull_to_refresh-1.6.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/pull_to_refresh-1.6.1", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "quiver", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.0.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/quiver-2.0.5", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "rxdart", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/rxdart-0.24.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/rxdart-0.24.1", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "shared_preferences", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.10", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.10", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_linux", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+2", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_macos", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+10", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+10", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_platform_interface", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_platform_interface-1.0.4", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_platform_interface-1.0.4", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shared_preferences_web", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shelf", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shelf-0.7.9", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shelf-0.7.9", "packageUri": "lib/", "languageVersion": "2.1" }, { "name": "shelf_web_socket", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shelf_web_socket-0.2.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shelf_web_socket-0.2.3", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "shimmer", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/shimmer-1.1.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shimmer-1.1.1", "packageUri": "lib/", "languageVersion": "1.20" }, { "name": "sky_engine", - "rootUri": "file:///Users/fnuser/Documents/flutter-sdk/bin/cache/pkg/sky_engine", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/bin/cache/pkg/sky_engine", "packageUri": "lib/", "languageVersion": "1.11" }, { "name": "source_gen", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/source_gen-0.9.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_gen-0.9.6", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "source_span", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/source_span-1.5.5", "packageUri": "lib/", "languageVersion": "1.8" }, { "name": "sqflite", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "sqflite_common", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/sqflite_common-1.0.2+1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite_common-1.0.2+1", "packageUri": "lib/", "languageVersion": "2.7" }, { "name": "stack_trace", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/stack_trace-1.9.3", "packageUri": "lib/", "languageVersion": "1.23" }, { "name": "stream_channel", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_channel-2.0.0", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "stream_transform", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/stream_transform-1.2.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/stream_transform-1.2.0", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "string_scanner", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.5", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/string_scanner-1.0.5", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "synchronized", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.2.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/synchronized-2.2.0", "packageUri": "lib/", "languageVersion": "2.6" }, { "name": "term_glyph", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/term_glyph-1.1.0", "packageUri": "lib/", "languageVersion": "1.8" }, { "name": "test_api", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.11", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/test_api-0.2.11", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "timing", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/timing-0.1.1+2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/timing-0.1.1+2", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "transformer_page_view", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/transformer_page_view-0.1.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/transformer_page_view-0.1.6", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "typed_data", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/typed_data-1.1.6", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "uuid", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.2.2", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/uuid-2.2.2", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "vector_math", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/vector_math-2.0.8", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "watcher", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/watcher-0.9.7+15", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/watcher-0.9.7+15", "packageUri": "lib/", "languageVersion": "2.2" }, { "name": "web_socket_channel", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/web_socket_channel-1.1.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/web_socket_channel-1.1.0", "packageUri": "lib/", "languageVersion": "2.0" }, { "name": "xdg_directories", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/xdg_directories-0.1.0", "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "xml", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/xml-3.5.0", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/xml-3.5.0", "packageUri": "lib/", "languageVersion": "2.3" }, { "name": "yaml", - "rootUri": "file:///Users/fnuser/.pub-cache/hosted/pub.flutter-io.cn/yaml-2.2.1", + "rootUri": "file:///Users/fnuoos/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/yaml-2.2.1", "packageUri": "lib/", "languageVersion": "2.4" }, @@ -710,7 +710,7 @@ "languageVersion": "2.1" } ], - "generated": "2020-09-17T12:08:09.612292Z", + "generated": "2020-09-17T13:00:22.994882Z", "generator": "pub", "generatorVersion": "2.7.2" } diff --git a/.idea/runConfigurations/example_lib_main_dart.xml b/.idea/runConfigurations/example_lib_main_dart.xml deleted file mode 100644 index 5fd9159..0000000 --- a/.idea/runConfigurations/example_lib_main_dart.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml deleted file mode 100644 index 6025467..0000000 --- a/.idea/saveactions_settings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..13372aef5e24af05341d49695ee84e5f9b594659 GIT binary patch literal 53636 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ⅅ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 H-+%o-(+5aQ literal 0 HcmV?d00001 diff --git a/android/gradlew b/android/gradlew new file mode 100755 index 0000000..9d82f78 --- /dev/null +++ b/android/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/android/gradlew.bat b/android/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/android/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index f60a2f8..721b546 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -128,4 +128,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 3dbe063e9c90a5d7c9e4e76e70a821b9e2c1d271 -COCOAPODS: 1.9.3 +COCOAPODS: 1.9.1 diff --git a/lib/pages/goods_details_page/bloc/goods_details_page_bloc.dart b/lib/pages/goods_details_page/bloc/goods_details_page_bloc.dart new file mode 100644 index 0000000..3960ec1 --- /dev/null +++ b/lib/pages/goods_details_page/bloc/goods_details_page_bloc.dart @@ -0,0 +1,39 @@ +import 'dart:async'; + +import 'package:bloc/bloc.dart'; +import 'package:equatable/equatable.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:zhiying_base_widget/pages/goods_details_page/bloc/goods_details_page_repository.dart'; +import 'package:zhiying_comm/util/empty_util.dart'; + +part 'goods_details_page_event.dart'; + +part 'goods_details_page_state.dart'; + +class GoodsDetailsPageBloc extends Bloc { + // GoodsDetailsPageBloc() : super(GoodsDetailsPageInitial()); + + @override + GoodsDetailsPageState get initialState => GoodsDetailsPageInitial(); + + GoodsDetailsPageRepository repository; + + GoodsDetailsPageBloc({@required this.repository}); + + @override + Stream mapEventToState( + GoodsDetailsPageEvent event, + ) async* { + if (event is GoodsDetailsPageInitEvent) { + yield* _mapInitEventToState(event); + } + } + + Stream _mapInitEventToState(GoodsDetailsPageInitEvent event) async* { + var result = await repository.fetchInitData(event.model); + if (!EmptyUtil.isEmpty(result)) + yield GoodsDetailsPageLoadedState(model: result); + else + yield GoodsDetailsPageErrorState(); + } +} diff --git a/lib/pages/goods_details_page/bloc/goods_details_page_event.dart b/lib/pages/goods_details_page/bloc/goods_details_page_event.dart new file mode 100644 index 0000000..4af1ac7 --- /dev/null +++ b/lib/pages/goods_details_page/bloc/goods_details_page_event.dart @@ -0,0 +1,15 @@ +part of 'goods_details_page_bloc.dart'; + +abstract class GoodsDetailsPageEvent extends Equatable { + const GoodsDetailsPageEvent(); +} + +/// 初始化 +class GoodsDetailsPageInitEvent extends GoodsDetailsPageEvent { + final Map model; + + const GoodsDetailsPageInitEvent({this.model}); + + @override + List get props => [this.model]; +} diff --git a/lib/pages/goods_details_page/bloc/goods_details_page_repository.dart b/lib/pages/goods_details_page/bloc/goods_details_page_repository.dart new file mode 100644 index 0000000..77ed80e --- /dev/null +++ b/lib/pages/goods_details_page/bloc/goods_details_page_repository.dart @@ -0,0 +1,40 @@ +import 'package:zhiying_comm/zhiying_comm.dart'; + +class GoodsDetailsPageRepository { + List> _pageData = []; + + /// 初始化 + Future>> fetchInitData(Map model) async { + int id = 13; + var result = await NetUtil.post('/api/v1/mod', + method: NetMethod.POST, + params: Map.from({ + 'ids': [id] + })); + try { + if(NetUtil.isSuccess(result) && !EmptyUtil.isEmpty(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA])) { + return _loadData(id, result[GlobalConfig.HTTP_RESPONSE_KEY_DATA]); + } + } catch (e) { + Logger.log(e); + } + return null; + } + + /// 处理数据 + List> _loadData(int id, dynamic data) { + String key = id.toString(); + Map json = Map.from(data); + if (json.containsKey(key)) { + List list = json[key]; + _pageData = list.map((item) { + return Map.from(item); + }).toList(); + return _pageData; + } + return null; + } + + /// 获取缓存数据？ + +} diff --git a/lib/pages/goods_details_page/bloc/goods_details_page_state.dart b/lib/pages/goods_details_page/bloc/goods_details_page_state.dart new file mode 100644 index 0000000..e15fc97 --- /dev/null +++ b/lib/pages/goods_details_page/bloc/goods_details_page_state.dart @@ -0,0 +1,24 @@ +part of 'goods_details_page_bloc.dart'; + +abstract class GoodsDetailsPageState extends Equatable { + const GoodsDetailsPageState(); + + @override + List get props => []; +} + +/// 初始化状态 +class GoodsDetailsPageInitial extends GoodsDetailsPageState {} + +/// 数据加载完毕状态 +class GoodsDetailsPageLoadedState extends GoodsDetailsPageState { + final List> model; + + const GoodsDetailsPageLoadedState({this.model}); + + @override + List get props => [this.model]; +} + +/// 数据加载出错 +class GoodsDetailsPageErrorState extends GoodsDetailsPageState {} diff --git a/lib/pages/goods_details_page/goods_details_page.dart b/lib/pages/goods_details_page/goods_details_page.dart new file mode 100644 index 0000000..a033f9f --- /dev/null +++ b/lib/pages/goods_details_page/goods_details_page.dart @@ -0,0 +1,193 @@ +import 'package:flutter/material.dart'; +import 'package:pull_to_refresh/pull_to_refresh.dart'; +import 'package:zhiying_base_widget/pages/goods_details_page/bloc/goods_details_page_bloc.dart'; +import 'package:zhiying_base_widget/pages/goods_details_page/bloc/goods_details_page_repository.dart'; +import 'package:zhiying_base_widget/pages/goods_details_page/notifier/goods_details_page_notifier.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/footer/goods_details_footer_widget.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; +import 'package:provider/provider.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'dart:ui'; + +class GoodsDetailsPage extends StatefulWidget { + final Map data; + + GoodsDetailsPage(this.data, {Key key}) : super(key: key); + + @override + _GoodsDetailsPageState createState() => _GoodsDetailsPageState(); +} + +class _GoodsDetailsPageState extends State { + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: HexColor.fromHex('#FFF1F1F1'), + body: MultiProvider( + providers: [ + /// 滑动通知 + ChangeNotifierProvider.value(value: GoodsDetailsPageNotifier()), + ], + child: BlocProvider( + create: (_) => GoodsDetailsPageBloc(repository: GoodsDetailsPageRepository())..add(GoodsDetailsPageInitEvent(model: widget?.data)), + child: GoodsDetailsContainer(widget?.data), + ), + ), + ); + } +} + +class GoodsDetailsContainer extends StatefulWidget { + final Map data; + + const GoodsDetailsContainer(this.data); + + @override + _GoodsDetailsContainerState createState() => _GoodsDetailsContainerState(); +} + +class _GoodsDetailsContainerState extends State { + bool _isEnded = false; + ScrollController _controller = ScrollController(); + RefreshController _refreshController = RefreshController(initialRefresh: false); + + void _onLoading() async { + // await Future.delayed(Duration(milliseconds: 1000)); + // if (mounted) setState(() {}); + // _refreshController.loadComplete(); + } + + /// 返回上一页 + void _openPop() { + print('返回上一页'); + + Navigator.maybePop(context); + } + + @override + void dispose() { + _controller.dispose(); + super.dispose(); + } + + @override + void initState() { + _controller.addListener(() { + // print('${_controller.offset} ${_controller.position.maxScrollExtent}'); + if (_controller.offset >= _controller.position.maxScrollExtent && !_isEnded) { + // 滑动到底部 + _isEnded = true; + Provider.of(context, listen: false).loadMore(); + } else if (_controller.offset < _controller.position.maxScrollExtent && _isEnded) { + _isEnded = false; + Provider.of(context, listen: false).reset(); + } + }); + super.initState(); + } + + @override + Widget build(BuildContext context) { + return MediaQuery.removePadding( + removeTop: true, + context: context, + child: Container( + width: double.infinity, + child: BlocConsumer( + listener: (BuildContext context, GoodsDetailsPageState state) { + if (state is GoodsDetailsPageErrorState) { + print('数据加载出错'); + } + }, + buildWhen: (previous, current) { + /// 数据加载出错不进行build + if (current is GoodsDetailsPageErrorState) { + return false; + } + return true; + }, + builder: (context, state) { + print('currente state = $state'); + if (state is GoodsDetailsPageLoadedState) { + return _getMainWidget(state?.model); + } + return _getMainWidget(null); + }, + ), + ), + ); + } + + /// 主视图 + Widget _getMainWidget(List> datas) { + return Stack( + fit: StackFit.passthrough, + children: [ + /// 主体布局 + SmartRefresher( + enablePullDown: true, + enablePullUp: false, + header: WaterDropHeader(), + controller: _refreshController, + onLoading: _onLoading, + child: CustomScrollView( + controller: _controller, + slivers: _createContent(context, datas ?? []), + ), + ), + /// appBar + Align( + alignment: Alignment.topCenter, + child: _getAppBarWidget()), + /// 底部 + Align(alignment: Alignment.bottomCenter, child: GoodsDetailsFooterWidget(null)) + ], + ); + } + + List _createContent(BuildContext context, List> datas) { + List list = List(); + for (int i = 0; i < datas.length; i++) { + WidgetModel item = WidgetModel.fromJson(Map.from(datas[i])); + + print('item.modName ${item.modName}'); + list.addAll(WidgetFactory.create( + item.modName, + isSliver: true, + model: datas[i], + )); + } + if (list.length <= 0) { + list.add(SliverToBoxAdapter( + child: Container( + height: 200, + child: Center( + child: Text('暂时无数据哦~'), + ), + ), + )); + } + return list; + } + + /// appBar + Widget _getAppBarWidget() { + return Container( + width: double.infinity, + height: 40, + margin: EdgeInsets.only(top: MediaQueryData.fromWindow(window).padding.top), + child: AppBar( + backgroundColor: Colors.transparent, + elevation: 0, + leading: IconButton( + icon: Icon( + Icons.arrow_back_ios, + size: 22, + color: HexColor.fromHex('#FFFFFF'), + ), + onPressed: () => _openPop(), + ), + ), + ); + } +} diff --git a/lib/pages/goods_details_page/notifier/goods_details_page_notifier.dart b/lib/pages/goods_details_page/notifier/goods_details_page_notifier.dart new file mode 100644 index 0000000..7e041d7 --- /dev/null +++ b/lib/pages/goods_details_page/notifier/goods_details_page_notifier.dart @@ -0,0 +1,16 @@ +import 'package:flutter/material.dart'; + +class GoodsDetailsPageNotifier with ChangeNotifier { + bool scrollEnd = false; + + // 加载更多数据 + void loadMore() { + scrollEnd = true; + notifyListeners(); + } + + void reset() { + scrollEnd = false; + notifyListeners(); + } +} diff --git a/lib/register.dart b/lib/register.dart index 1202d8a..8c65ebb 100644 --- a/lib/register.dart +++ b/lib/register.dart @@ -1,12 +1,23 @@ +import 'package:flutter/cupertino.dart'; +import 'package:zhiying_base_widget/pages/goods_details_page/goods_details_page.dart'; import 'package:zhiying_base_widget/pages/home_page/home_page.dart'; import 'package:zhiying_base_widget/pages/main_page/main_page.dart'; import 'package:zhiying_base_widget/pages/mine_detail_page/mine_detail_page.dart'; import 'package:zhiying_base_widget/pages/setting_page/setting_page.dart'; import 'package:zhiying_base_widget/pages/wallet_page/wallet_page.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/footer/goods_details_footer_widget.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/price/goods_details_price_widget.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/goods_details_slide_banner_widget.dart'; +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_notice/model/home_notice_model.dart'; import 'package:zhiying_base_widget/widgets/home/home_slide_banner/home_slide_banner_creater.dart'; +import 'package:zhiying_base_widget/widgets/home/home_sreach/home_sreach_creater.dart'; +import 'package:zhiying_base_widget/widgets/home/home_sreach/home_sreach_widget.dart'; import 'package:zhiying_base_widget/widgets/mine/mine_data/mine_data.dart'; import 'package:zhiying_base_widget/widgets/mine/mine_header/mine_header.dart'; import 'package:zhiying_base_widget/widgets/mine/mine_nav/mine_nav_bg.dart'; @@ -19,6 +30,9 @@ import 'package:zhiying_base_widget/widgets/wallet/wallet_income/wallet_income.d import 'package:zhiying_comm/util/defalut_widget_creater.dart'; import 'package:zhiying_comm/zhiying_comm.dart'; +import 'widgets/goods_details/coupon/counpon_widget.dart'; +import 'widgets/goods_details/evaluate/goods_details_evaluate_widget.dart'; +import 'widgets/goods_details/title/goods_details_title_widget.dart'; import 'widgets/home/home_quick_entry/home_quick_entry.dart'; class BaseWidgetRegister { @@ -34,14 +48,15 @@ class BaseWidgetRegister { PageFactory.regist('index', (model) => MainPage(model)); PageFactory.regist('profile', (model) => MainPage(model)); PageFactory.regist('category', (model) => WalletPage()); + PageFactory.regist('goods_details', (model) => GoodsDetailsPage(model)); // PageFactory.regist('login', (model) => LoginPage(model)); // PageFactory.regist('login_quick', (model) => LoginQuickPage(model)); // PageFactory.regist('login_account', (model) => LoginAccountPage(model)); // PageFactory.regist('login_invite', (model) => LoginInvitePage()); - PageFactory.regist( - 'pub.flutter.profile_settings', (model) => MineDetailPage()); + PageFactory.regist('pub.flutter.profile_settings', (model) => MineDetailPage()); PageFactory.regist('pub.flutter.settings', (model) => SettingPage(model)); + } // 注册控件 @@ -51,43 +66,60 @@ class BaseWidgetRegister { WidgetFactory.regist('normal_nav', NormalNavCreater()); // ==================== 首页 -// WidgetFactory.regist('index_title', NormalNavCreater()); -// WidgetFactory.regist( -// 'index_search', DefaultWidgetCreater((model) => MineData())); - -// /// 可滚动banner + // WidgetFactory.regist('index_title', NormalNavCreater()); + /// 首页搜索栏 + // WidgetFactory.regist('index_search', HomeSreachCreater()); + // WidgetFactory.regist('index_search', DefaultWidgetCreater((model) => HomeSreachWidget(model))); + /// 可滚动banner WidgetFactory.regist('index_carousel', HomeSlideBannerCreater()); WidgetFactory.regist('index_recommend_list', GoodsListCreater()); -// /// 首页快速入口 - WidgetFactory.regist( - 'multi_nav', DefaultWidgetCreater((model) => HomeQuickEntry(model))); -// -// /// 不可以滚动banner + + /// 首页快速入口 + WidgetFactory.regist('multi_nav', DefaultWidgetCreater((model) => HomeQuickEntry(model))); + + /// 滚动公告 + WidgetFactory.regist('index_placard', DefaultWidgetCreater((model) => HomeNoticeWidget(model))); + + /// 不可以滚动banner WidgetFactory.regist('index_banner_one', HomeBannerCreater()); WidgetFactory.regist('index_banner_two', HomeBannerCreater()); + /// ==================== 商品详情 ==================== /// + // 商品详情轮播图 + WidgetFactory.regist('product_detail_carousel', DefaultWidgetCreater((model) => GoodsDetailsSlideBannerWidget(model))); + // 商品详情下载APP提示 + WidgetFactory.regist('product_detail_download_tips', DefaultWidgetCreater((model) => UpgradeTipWidget(model))); + // 商品详情价格显示 + WidgetFactory.regist('product_detail_price', DefaultWidgetCreater((model) => GoodsDetailsPriceWidget(model))); + // 商品详情标题 + WidgetFactory.regist('product_detail_title', DefaultWidgetCreater((model) => GoodsDetailsTitleWidget(model))); + // 商品详情优惠劵 + WidgetFactory.regist('product_detail_coupon', DefaultWidgetCreater((model) => CounponWidget(model))); + // 商品详情店铺 + WidgetFactory.regist('product_detail_shop', DefaultWidgetCreater((model) => StoreWidget(model))); + // 商品详情宝贝评价 + WidgetFactory.regist('product_detail_comment', DefaultWidgetCreater((model) => GoodsDetailsEvaluateWidget(model))); + // 商品详情图片 + // WidgetFactory.regist('product_detail_img_list', MineNavCreater()); + // 商品详情底部推荐列表 + // WidgetFactory.regist('product_detail_bottom_rec', DefaultWidgetCreater((model) => GoodsDetailsEvaluateWidget(model))); + // 商品详情底部 + WidgetFactory.regist('product_detail_bottom', DefaultWidgetCreater((model) => GoodsDetailsFooterWidget(model))); + + // ==================== 个人中心 WidgetFactory.regist('profile_appbar', MineNavCreater()); - WidgetFactory.regist('profile_background', - DefaultWidgetCreater((model) => MineNavBg(model))); - WidgetFactory.regist( - 'profile_header', DefaultWidgetCreater((model) => MineHeader(model))); - WidgetFactory.regist( - 'profile_earning', DefaultWidgetCreater((model) => MineData(model))); - WidgetFactory.regist('profile_functions', - DefaultWidgetCreater((model) => MineQuickEntry(model))); - WidgetFactory.regist('profile_my_functions', - DefaultWidgetCreater((model) => MineQuickEntry(model))); - WidgetFactory.regist('profile_carousel', - DefaultWidgetCreater((model) => HomeBannerWidget(model))); + WidgetFactory.regist('profile_background', DefaultWidgetCreater((model) => MineNavBg(model))); + WidgetFactory.regist('profile_header', DefaultWidgetCreater((model) => MineHeader(model))); + WidgetFactory.regist('profile_earning', DefaultWidgetCreater((model) => MineData(model))); + WidgetFactory.regist('profile_functions', DefaultWidgetCreater((model) => MineQuickEntry(model))); + WidgetFactory.regist('profile_my_functions', DefaultWidgetCreater((model) => MineQuickEntry(model))); + WidgetFactory.regist('profile_carousel', DefaultWidgetCreater((model) => HomeBannerWidget(model))); // ==================== 钱包 - WidgetFactory.regist( - 'wallet_data', DefaultWidgetCreater((model) => WalletData())); - WidgetFactory.regist( - 'wallet_detail', DefaultWidgetCreater((model) => WalletDetail())); + WidgetFactory.regist('wallet_data', DefaultWidgetCreater((model) => WalletData())); + WidgetFactory.regist('wallet_detail', DefaultWidgetCreater((model) => WalletDetail())); - WidgetFactory.regist( - 'wallet_income', DefaultWidgetCreater((model) => WalletIncome())); + WidgetFactory.regist('wallet_income', DefaultWidgetCreater((model) => WalletIncome())); } } diff --git a/lib/widgets/goods_details/counpon_description/counpon_description_widget.dart b/lib/widgets/goods_details/counpon_description/counpon_description_widget.dart new file mode 100644 index 0000000..cbafae9 --- /dev/null +++ b/lib/widgets/goods_details/counpon_description/counpon_description_widget.dart @@ -0,0 +1,61 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +/// +/// 优惠券说明 +/// +class CounponDescriptionWidget extends StatelessWidget { + final Map model; + + const CounponDescriptionWidget(this.model); + + @override + Widget build(BuildContext context) { + return Container( + margin: const EdgeInsets.symmetric(horizontal: 12.5), + width: double.infinity, + child:_getMainWidget(), + ); + } + + /// 主widget + Widget _getMainWidget() { + return Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + + /// 领券立减 + Padding(padding: const EdgeInsets.only(right: 5), child: _getButtom1Widget()), + + + /// 收货后返现 + Padding(padding: const EdgeInsets.only(right: 5), child: _getButtom2Widget()), + + + ], + ); + } + + /// 领券立减 + Widget _getButtom1Widget() { + return Container( + decoration: BoxDecoration( + color: HexColor.fromHex('#FFE0E0'), + borderRadius: BorderRadius.circular(50), + ), + padding: const EdgeInsets.only(left: 14, right: 14, top: 3, bottom: 3), + child: Text('领券立减100元', style: TextStyle(color: HexColor.fromHex('#FF4242'), fontSize: 11))); + } + + + /// 收货后返现 + Widget _getButtom2Widget() { + return Container( + decoration: BoxDecoration( + color: HexColor.fromHex('#FFEFDA'), + borderRadius: BorderRadius.circular(50), + ), + padding: const EdgeInsets.only(left: 14, right: 14, top: 3, bottom: 3), + child: Text('收货后返现5.5元', style: TextStyle(color: HexColor.fromHex('#B78107'), fontSize: 11))); + } +} diff --git a/lib/widgets/goods_details/coupon/bloc/bloc.dart b/lib/widgets/goods_details/coupon/bloc/bloc.dart new file mode 100644 index 0000000..8c610f6 --- /dev/null +++ b/lib/widgets/goods_details/coupon/bloc/bloc.dart @@ -0,0 +1,3 @@ +export 'counpon_bloc.dart'; +export 'counpon_event.dart'; +export 'counpon_state.dart'; \ No newline at end of file diff --git a/lib/widgets/goods_details/coupon/bloc/counpon_bloc.dart b/lib/widgets/goods_details/coupon/bloc/counpon_bloc.dart new file mode 100644 index 0000000..bf024b8 --- /dev/null +++ b/lib/widgets/goods_details/coupon/bloc/counpon_bloc.dart @@ -0,0 +1,30 @@ +import 'dart:async'; +import 'dart:math'; + +import 'package:bloc/bloc.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/coupon/bloc/counpon_repository.dart'; +import 'bloc.dart'; + +class CounponBloc extends Bloc { + @override + CounponState get initialState => CounponInitial(); + + CounponRepository repository; + + CounponBloc({this.repository}); + + @override + Stream mapEventToState( + CounponEvent event, + ) async* { + if (event is CounponInitEvent) { + yield* _mapInitEnvetTostate(event); + } + } + + /// 获取数据 + Stream _mapInitEnvetTostate(CounponInitEvent event) async* { + var result = await repository.fetchParentData(event); + yield CounponLoadedState(model: result); + } +} diff --git a/lib/widgets/goods_details/coupon/bloc/counpon_event.dart b/lib/widgets/goods_details/coupon/bloc/counpon_event.dart new file mode 100644 index 0000000..17697b0 --- /dev/null +++ b/lib/widgets/goods_details/coupon/bloc/counpon_event.dart @@ -0,0 +1,15 @@ +import 'package:equatable/equatable.dart'; + +abstract class CounponEvent extends Equatable { + const CounponEvent(); +} + +/// 初始化请求 +class CounponInitEvent extends CounponEvent { + final Map model; + + const CounponInitEvent({this.model}); + + @override + List get props => [this.model]; +} diff --git a/lib/widgets/goods_details/coupon/bloc/counpon_repository.dart b/lib/widgets/goods_details/coupon/bloc/counpon_repository.dart new file mode 100644 index 0000000..4d5a4f3 --- /dev/null +++ b/lib/widgets/goods_details/coupon/bloc/counpon_repository.dart @@ -0,0 +1,11 @@ +import 'package:zhiying_base_widget/widgets/goods_details/coupon/bloc/bloc.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/coupon/model/counpon_model.dart'; + +class CounponRepository { + + /// 获取父页面传进来的数据 + Future fetchParentData(CounponInitEvent event) async{ + return null; + } + +} diff --git a/lib/widgets/goods_details/coupon/bloc/counpon_state.dart b/lib/widgets/goods_details/coupon/bloc/counpon_state.dart new file mode 100644 index 0000000..8dcc9a0 --- /dev/null +++ b/lib/widgets/goods_details/coupon/bloc/counpon_state.dart @@ -0,0 +1,25 @@ +import 'package:equatable/equatable.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/coupon/model/counpon_model.dart'; + +abstract class CounponState extends Equatable { + const CounponState(); +} + +class CounponInitial extends CounponState { + @override + List get props => []; +} + +class CounponLoadedState extends CounponState { + CounponModel model; + + CounponLoadedState({this.model}); + + @override + List get props => [this.model]; +} + +class CounponErrorState extends CounponState { + @override + List get props => []; +} diff --git a/lib/widgets/goods_details/coupon/counpon_sk.dart b/lib/widgets/goods_details/coupon/counpon_sk.dart new file mode 100644 index 0000000..65e33d6 --- /dev/null +++ b/lib/widgets/goods_details/coupon/counpon_sk.dart @@ -0,0 +1,26 @@ +import 'package:shimmer/shimmer.dart'; +import 'package:flutter/material.dart'; + +class CounponSkeleton extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Container( + margin: const EdgeInsets.only(left: 12.5, right: 12.5), + width: double.infinity, + height: 70, + child: _shimmerWidget(width: double.infinity, height: 65, radius: 7.5), + ); + } + + Widget _shimmerWidget({double width, double height, double radius = 0}) { + return Shimmer.fromColors( + baseColor: Colors.grey[300], + highlightColor: Colors.grey[100], + child: Container( + width: width, + height: height, + decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(radius)), + ), + ); + } +} diff --git a/lib/widgets/goods_details/coupon/counpon_widget.dart b/lib/widgets/goods_details/coupon/counpon_widget.dart new file mode 100644 index 0000000..0af9170 --- /dev/null +++ b/lib/widgets/goods_details/coupon/counpon_widget.dart @@ -0,0 +1,104 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/coupon/bloc/bloc.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/coupon/bloc/counpon_repository.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/coupon/counpon_sk.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/coupon/model/counpon_model.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +/// +/// 优惠券widget +/// +class CounponWidget extends StatelessWidget { + final Map model; + + const CounponWidget(this.model); + + @override + Widget build(BuildContext context) { + return Container(); + // return BlocProvider( + // create: (_) => CounponBloc(repository: CounponRepository())..add(CounponInitEvent(model: model)), + // child: CounponContainer(), + // ); + } +} + +class CounponContainer extends StatefulWidget { + @override + _CounponContainerState createState() => _CounponContainerState(); +} + +class _CounponContainerState extends State { + /// 点击领取 + void _onJump(CounponModel model) {} + + @override + Widget build(BuildContext context) { + BlocConsumer( + listener: (context, state) {}, + buildWhen: (prev, current) { + if (current is CounponErrorState) { + return false; + } + return true; + }, + builder: (context, state) { + if (state is CounponLoadedState) { + // return _getMainWdiget(state.model); + } + // return CounponSkeleton(); + return Container(); + }, + ); + } + + /// 主视图 + Widget _getMainWdiget(CounponModel model) { + return GestureDetector( + onTap: () => _onJump(model), + behavior: HitTestBehavior.opaque, + child: Container( + width: double.infinity, + margin: const EdgeInsets.only(left: 12.5, right: 12.5), + padding: const EdgeInsets.only(left: 18.5), + alignment: Alignment.centerLeft, + child: Row( + children: [ + /// 价格 + _getPriceWidget(model), + const SizedBox(width: 7.5), + /// 有效期 + _getTimeWidget(model) + ], + ), + ), + ); + } + + /// 价格 + Widget _getPriceWidget(CounponModel model) { + return Row( + children: [ + /// 价格类型 + Text('￥', style: TextStyle(fontSize: 15, color: HexColor.fromHex('#FFFFFF'))), + + /// 价格 + Text('100', style: TextStyle(fontSize: 30, color: HexColor.fromHex('#FFFFFF'))), + ], + ); + } + + /// 名称与有效期 + Widget _getTimeWidget(CounponModel model) { + return Column( + children: [ + /// 标题 + Text('优惠券', style: TextStyle(fontSize: 17, color: HexColor.fromHex('#FFFFFF'))), + + /// 到期时间 + Text('有效期至2020-10-01', style: TextStyle(fontSize: 10, color: HexColor.fromHex('#FFFFFF'))) + ], + ); + } +} diff --git a/lib/widgets/goods_details/coupon/model/counpon_model.dart b/lib/widgets/goods_details/coupon/model/counpon_model.dart new file mode 100644 index 0000000..090b814 --- /dev/null +++ b/lib/widgets/goods_details/coupon/model/counpon_model.dart @@ -0,0 +1,2 @@ + +class CounponModel{} \ No newline at end of file diff --git a/lib/widgets/goods_details/evaluate/godds_details_evaluate_sk.dart b/lib/widgets/goods_details/evaluate/godds_details_evaluate_sk.dart new file mode 100644 index 0000000..bcb6668 --- /dev/null +++ b/lib/widgets/goods_details/evaluate/godds_details_evaluate_sk.dart @@ -0,0 +1,27 @@ +import 'package:shimmer/shimmer.dart'; +import 'package:flutter/material.dart'; + +/// +/// 商品详情评论骨架屏幕 +/// +class GoodsDetailsEvaluateSkeleton extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Container(); + } + + + Widget _shimmerWidget({double width, double height, double radius = 0}) { + return Shimmer.fromColors( + baseColor: Colors.grey[300], + highlightColor: Colors.grey[100], + child: Container( + width: width, + height: height, + decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(radius)), + ), + ); + } +} + + diff --git a/lib/widgets/goods_details/evaluate/goods_details_evaluate_widget.dart b/lib/widgets/goods_details/evaluate/goods_details_evaluate_widget.dart new file mode 100644 index 0000000..1f404f5 --- /dev/null +++ b/lib/widgets/goods_details/evaluate/goods_details_evaluate_widget.dart @@ -0,0 +1,38 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +/// +/// 商品详情评价Widget +/// +class GoodsDetailsEvaluateWidget extends StatelessWidget { + final Map model; + + const GoodsDetailsEvaluateWidget(this.model); + + /// 点击查看更多 + void _openLookMore() {} + + @override + Widget build(BuildContext context) { + return GestureDetector( + onTap: () => _openLookMore(), + behavior: HitTestBehavior.opaque, + child: Container( + width: double.infinity, + padding: const EdgeInsets.only(top: 15, bottom: 15, left: 12.5, right: 12.5), + child: getMainWidget(), + ), + ); + } + + /// 评价以及查看更多 + Widget getMainWidget() { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text('宝贝评价', style: TextStyle(color: HexColor.fromHex('#333333'), fontSize: 12)), + Text('查看更多 >', style: TextStyle(color: HexColor.fromHex('#999999'), fontSize: 11)), + ], + ); + } +} diff --git a/lib/widgets/goods_details/footer/goods_details_footer_sk.dart b/lib/widgets/goods_details/footer/goods_details_footer_sk.dart new file mode 100644 index 0000000..bf7e85e --- /dev/null +++ b/lib/widgets/goods_details/footer/goods_details_footer_sk.dart @@ -0,0 +1,38 @@ +import 'package:shimmer/shimmer.dart'; +import 'package:flutter/material.dart'; + +class GoodsDetailsFooterSkeleton extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Container( + width: double.infinity, + padding: const EdgeInsets.only(left: 21, right: 12.5, top: 12.5, bottom: 12.5), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + _shimmerWidget(width: 30, height: 30,), + const SizedBox(width: 35), + _shimmerWidget(width: 30, height: 30,), + ], + ), + + _shimmerWidget( height: 44, width: 230, radius: 22), + ], + ), + ); + } + + Widget _shimmerWidget({double width, double height, double radius = 0}) { + return Shimmer.fromColors( + baseColor: Colors.grey[300], + highlightColor: Colors.grey[100], + child: Container( + width: width, + height: height, + decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(radius)), + ), + ); + } +} diff --git a/lib/widgets/goods_details/footer/goods_details_footer_widget.dart b/lib/widgets/goods_details/footer/goods_details_footer_widget.dart new file mode 100644 index 0000000..1ec445c --- /dev/null +++ b/lib/widgets/goods_details/footer/goods_details_footer_widget.dart @@ -0,0 +1,169 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +/// +/// 商品详情底部Widget +/// +class GoodsDetailsFooterWidget extends StatelessWidget { + + final Map model; + + const GoodsDetailsFooterWidget(this.model); + + @override + Widget build(BuildContext context) { + return GooddsDetailsFooterContainer(); + } +} + +class GooddsDetailsFooterContainer extends StatefulWidget { + @override + _GooddsDetailsFooterContainerState createState() => _GooddsDetailsFooterContainerState(); +} + +class _GooddsDetailsFooterContainerState extends State { + /// 打开首页 + void _openHome() {} + + /// 收藏 + void _collectOnClick() {} + + /// 分享 + void _shareOnClick() {} + + /// 自购省 + void _savemoneyOnClick() {} + + @override + Widget build(BuildContext context) { + return Container( + height: 70, + width: double.infinity, + padding: const EdgeInsets.only(bottom: 10, top: 12.5, left: 21, right: 12.5), + decoration: BoxDecoration( + boxShadow:[ + BoxShadow(color: Colors.grey[300], offset: Offset(0.0, 0.0), blurRadius: 5.0, spreadRadius: 2.0), + BoxShadow(color: Colors.grey[300], offset: Offset(0.0, 0.0)), + ], + color: Colors.white + ), + child: _getMainWidet(), + ); + } + + /// 主Widget + Widget _getMainWidet() { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + /// 首页与收藏 + _getLeftWidget(), + + /// 分享赚与自购省 + _getRightWidget(), + ], + ); + } + + /// 首页 和 收藏 + Widget _getLeftWidget() { + return Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => _openHome(), + child: Padding( + padding: const EdgeInsets.only(right: 35), + child: _getCustomWidget('首页', '999999', null), + )), + GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => _collectOnClick(), + child: Padding(padding: const EdgeInsets.only(right: 0), child: _getCustomWidget('收藏', '999999', null))) + ], + ); + } + + /// 分享赚与自购省 + Widget _getRightWidget() { + return Row( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.center, + children: [_getFxzButton(), _getZgsButton()], + ); + } + + /// 分享赚， + Widget _getFxzButton() { + return GestureDetector( + onTap: () => _shareOnClick(), + child: Container( + alignment: Alignment.center, + padding: const EdgeInsets.only(left: 30, right: 30, top: 5, bottom: 5), + decoration: BoxDecoration( + gradient: LinearGradient(colors: [HexColor.fromHex('#FFCA66'), HexColor.fromHex('#FFD961')], begin: Alignment.centerLeft, end: Alignment.centerRight), + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(25), + topLeft: Radius.circular(25) + ) + ), + child: Column( + children: [ + RichText( + text: TextSpan(text: '¥', style: TextStyle(fontSize: 12, color: HexColor.fromHex('FFFFFF')), children: [ + TextSpan(text: '3.10', style: TextStyle(fontSize: 15, color: HexColor.fromHex('#FFFFFF'))), + ]), + ), + Text('分享赚', style: TextStyle(color: HexColor.fromHex('#FFFFFF'), fontSize: 15)) + ], + ), + ), + ); + } + + /// 自购省 + Widget _getZgsButton() { + return GestureDetector( + behavior: HitTestBehavior.opaque, + onTap: () => _savemoneyOnClick(), + child: Container( + alignment: Alignment.center, + padding: const EdgeInsets.only(left: 30, right: 30, top: 5, bottom: 5), + decoration: BoxDecoration( + gradient: LinearGradient(colors: [HexColor.fromHex('#FF6969'), HexColor.fromHex('#FF4646')], begin: Alignment.centerLeft, end: Alignment.centerRight), + borderRadius: BorderRadius.only( + bottomRight: Radius.circular(25), + topRight: Radius.circular(25) + ) + ), + child: Column( + children: [ + RichText( + text: TextSpan(text: '¥', style: TextStyle(fontSize: 12, color: HexColor.fromHex('FFFFFF')), children: [ + TextSpan(text: '23.10', style: TextStyle(fontSize: 15, color: HexColor.fromHex('#FFFFFF'))), + ]), + ), + Text('自购省', style: TextStyle(color: HexColor.fromHex('#FFFFFF'), fontSize: 15)) + ], + ), + ), + ); + } + + Widget _getCustomWidget(String text, String textColor, String icon) { + return Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.end, + children: [ + /// 图标 + Container(height: 25, width: 25, color: Colors.red, margin: const EdgeInsets.only(bottom: 3)), + + /// 图片 + Text(text, style: TextStyle(color: HexColor.fromHex(textColor), fontSize: 11)) + ], + ); + } +} diff --git a/lib/widgets/goods_details/price/goods_details_price_widget.dart b/lib/widgets/goods_details/price/goods_details_price_widget.dart new file mode 100644 index 0000000..36d22ca --- /dev/null +++ b/lib/widgets/goods_details/price/goods_details_price_widget.dart @@ -0,0 +1,83 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +/// +/// 商品详情价格widget +/// +class GoodsDetailsPriceWidget extends StatelessWidget { + final Map model; + + const GoodsDetailsPriceWidget(this.model); + + @override + Widget build(BuildContext context) { + return Container(margin: const EdgeInsets.symmetric(horizontal: 12.5), child: _getMainWidget()); + } + + /// 主体视图 + Widget _getMainWidget() { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + _getLeftWidget(), + + /// 右边widget + _getBuyNumberWidget(), + ], + ); + } + + /// 左边的wiget 包括价格等 + Widget _getLeftWidget() { + return Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + /// 价格 + _getPriceWidget(), + const SizedBox(width: 5), + + /// 券后 + _getQhPriceWidget(), + const SizedBox(width: 5), + + /// 积分 + _getPointsWidget() + ], + ); + } + + /// 价格 + Widget _getPriceWidget() { + return Row( + children: [ + Text('￥', style: TextStyle(color: HexColor.fromHex('#FF4242'), fontSize: 15)), + Text('99', style: TextStyle(color: HexColor.fromHex('#FF4242'), fontSize: 30)), + ], + ); + } + + /// 积分 + Widget _getPointsWidget() { + return Container( + decoration: BoxDecoration(color: HexColor.fromHex('#FFEFDA'), borderRadius: BorderRadius.circular(5)), + padding: const EdgeInsets.only(left: 4, right: 7.5, top: 4, bottom: 4), + child: Text('', style: TextStyle(color: HexColor.fromHex('#B78107'), fontSize: 9)), + ); + } + + /// 券后价格 + Widget _getQhPriceWidget() { + return Column( + children: [ + Text('券后', style: TextStyle(color: HexColor.fromHex('#FF4242'), fontSize: 11)), + Text('¥ 199', style: TextStyle(color: HexColor.fromHex('#FF4242'), fontSize: 10)), + ], + ); + } + + /// 购买人数 + Widget _getBuyNumberWidget() { + return Text('99999人已购买', style: TextStyle(color: HexColor.fromHex('#999999'), fontSize: 12.5)); + } +} diff --git a/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_bloc.dart b/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_bloc.dart new file mode 100644 index 0000000..de1fd8f --- /dev/null +++ b/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_bloc.dart @@ -0,0 +1,46 @@ +import 'dart:async'; +import 'dart:math'; + +import 'package:bloc/bloc.dart'; +import 'package:equatable/equatable.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_repository.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/model/goods_details_silde_banner_model.dart'; +import 'package:zhiying_comm/util/empty_util.dart'; + +part 'goods_details_slide_banner_event.dart'; + +part 'goods_details_slide_banner_state.dart'; + +class GoodsDetailsSlideBannerBloc extends Bloc { + GoodsDetailsSlideBannerRepository repository; + + GoodsDetailsSlideBannerBloc({@required this.repository}); + + @override + GoodsDetailsSlideBannerState get initialState => GoodsDetailsSlideBannerInitial(); + + @override + Stream mapEventToState( + GoodsDetailsSlideBannerEvent event, + ) async* { + /// 初始化 + if (event is GoodsDetailsSlideBannerInitEvent) { + yield* _mapInitEventToState(event); + } + } + + /// 初始化 + Stream _mapInitEventToState(GoodsDetailsSlideBannerInitEvent event) async* { + var parentData = await repository.fetchParentData(event.model); + if (!EmptyUtil.isEmpty(parentData)) { + yield GoodsDetailsSlideBannerLoadedState(model: parentData); + return; + } + var netData = await repository.fetchNetData(event.model); + if (!EmptyUtil.isEmpty(netData)) + yield GoodsDetailsSlideBannerLoadedState(model: parentData); + else + yield GoodsDetailsSlideBannerErrorState(); + } +} diff --git a/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_event.dart b/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_event.dart new file mode 100644 index 0000000..68ece5c --- /dev/null +++ b/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_event.dart @@ -0,0 +1,15 @@ +part of 'goods_details_slide_banner_bloc.dart'; + +abstract class GoodsDetailsSlideBannerEvent extends Equatable { + const GoodsDetailsSlideBannerEvent(); +} + +/// 初始化事件 +class GoodsDetailsSlideBannerInitEvent extends GoodsDetailsSlideBannerEvent { + final Map model; + + const GoodsDetailsSlideBannerInitEvent({@required this.model}); + + @override + List get props => [this.model]; +} diff --git a/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_repository.dart b/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_repository.dart new file mode 100644 index 0000000..c43c29a --- /dev/null +++ b/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_repository.dart @@ -0,0 +1,21 @@ +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/model/goods_details_silde_banner_model.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +class GoodsDetailsSlideBannerRepository { + /// 加载父页面数据 + Future fetchParentData(final Map model) async { + if (!EmptyUtil.isEmpty(model)) { + try { + return GoodsDetailsSlideBannerModel.fromJson(model['data']); + } catch (e) { + Logger.log(e); + } + } + return null; + } + + /// 加载网络数据 + Future fetchNetData(final Map model) async { + return null; + } +} diff --git a/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_state.dart b/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_state.dart new file mode 100644 index 0000000..ad4637a --- /dev/null +++ b/lib/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_state.dart @@ -0,0 +1,26 @@ +part of 'goods_details_slide_banner_bloc.dart'; + +abstract class GoodsDetailsSlideBannerState extends Equatable { + const GoodsDetailsSlideBannerState(); +} + +class GoodsDetailsSlideBannerInitial extends GoodsDetailsSlideBannerState { + @override + List get props => []; +} + +/// 数据加载成功 +class GoodsDetailsSlideBannerLoadedState extends GoodsDetailsSlideBannerState { + GoodsDetailsSlideBannerModel model; + + GoodsDetailsSlideBannerLoadedState({this.model}); + + @override + List get props => [this.model]; +} + +/// 数据加载失败 +class GoodsDetailsSlideBannerErrorState extends GoodsDetailsSlideBannerState { + @override + List get props => []; +} diff --git a/lib/widgets/goods_details/slide_banner/goods_details_slide_banner_creater.dart b/lib/widgets/goods_details/slide_banner/goods_details_slide_banner_creater.dart new file mode 100644 index 0000000..aa80309 --- /dev/null +++ b/lib/widgets/goods_details/slide_banner/goods_details_slide_banner_creater.dart @@ -0,0 +1,19 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/goods_details_slide_banner_sk.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/goods_details_slide_banner_widget.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +/// +/// 可以滚动Banner +/// +class HomeSlideBannerCreater extends WidgetCreater { + @override + List createSkeleton(Map model) { + return [GoodsDetailsSlideBannerSkeleton()]; + } + + @override + List createWidgets(Map model) { + return [GoodsDetailsSlideBannerWidget(model)]; + } +} diff --git a/lib/widgets/goods_details/slide_banner/goods_details_slide_banner_sk.dart b/lib/widgets/goods_details/slide_banner/goods_details_slide_banner_sk.dart new file mode 100644 index 0000000..fb50ce9 --- /dev/null +++ b/lib/widgets/goods_details/slide_banner/goods_details_slide_banner_sk.dart @@ -0,0 +1,21 @@ +import 'package:flutter/material.dart'; +import 'package:shimmer/shimmer.dart'; + +class GoodsDetailsSlideBannerSkeleton extends StatelessWidget { + @override + Widget build(BuildContext context) { + return _shimmerWidget(width: double.infinity, height: 375); + } + + Widget _shimmerWidget({double width, double height, double radius = 0}) { + return Shimmer.fromColors( + baseColor: Colors.grey[300], + highlightColor: Colors.grey[100], + child: Container( + width: width, + height: height, + decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(radius)), + ), + ); + } +} diff --git a/lib/widgets/goods_details/slide_banner/goods_details_slide_banner_widget.dart b/lib/widgets/goods_details/slide_banner/goods_details_slide_banner_widget.dart new file mode 100644 index 0000000..c1abccf --- /dev/null +++ b/lib/widgets/goods_details/slide_banner/goods_details_slide_banner_widget.dart @@ -0,0 +1,172 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_swiper/flutter_swiper.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_bloc.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/bloc/goods_details_slide_banner_repository.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/goods_details_slide_banner_sk.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/slide_banner/model/goods_details_silde_banner_model.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; +import 'package:cached_network_image/cached_network_image.dart'; + +/// +/// 商品详情轮播图 +/// +class GoodsDetailsSlideBannerWidget extends StatelessWidget { + final Map model; + + const GoodsDetailsSlideBannerWidget(this.model, {Key key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (_) => GoodsDetailsSlideBannerBloc(repository: GoodsDetailsSlideBannerRepository())..add(GoodsDetailsSlideBannerInitEvent(model: model)), + child: GoodsDetailsSlideBannerContainer(model), + ); + } +} + +class GoodsDetailsSlideBannerContainer extends StatefulWidget { + final Map model; + + const GoodsDetailsSlideBannerContainer(this.model, {Key key}) : super(key: key); + + @override + _GoodsDetailsSlideBannerContainerState createState() => _GoodsDetailsSlideBannerContainerState(); +} + +class _GoodsDetailsSlideBannerContainerState extends State { + /// 子元素点击事件 + void _itemOnClick(IndexCarousel model) { + print('点击了 $model'); + } + + @override + Widget build(BuildContext context) { + return BlocConsumer( + listener: (BuildContext context, GoodsDetailsSlideBannerState state) { + if (state is GoodsDetailsSlideBannerErrorState) { + print('数据加载出错'); + } + }, + buildWhen: (previous, current) { + /// 数据加载出错不进行build + if (current is GoodsDetailsSlideBannerErrorState) { + return false; + } + return true; + }, + builder: (context, state) { + print('currente state = $state'); + if (state is GoodsDetailsSlideBannerLoadedState) { + if (!EmptyUtil.isEmpty(state.model) && !EmptyUtil.isEmpty(state.model.index_carousel_list)) { + return _getMainWidget(state.model); + } + } + // 骨架屏 + return GoodsDetailsSlideBannerSkeleton(); + }, + ); + } + + /// 页面 + Widget _getMainWidget(GoodsDetailsSlideBannerModel datas) { + return Container( + width: double.infinity, + height: 375, + child: Swiper( + itemBuilder: (BuildContext context, int index) { + IndexCarousel items = datas.index_carousel_list[index]; + return Container( + width: double.infinity, + child: CachedNetworkImage(imageUrl: items?.img ?? '', fit: BoxFit.cover), + ); + }, + itemCount: datas?.index_carousel_list?.length ?? 0, + loop: true, + autoplay: true, + onTap: (index) => _itemOnClick(datas.index_carousel_list[index]), + pagination: _getSwiperStyleByType(datas, datas?.index_carousel_list?.length ?? 0), + ), + ); + } + + /// 获取进度样式 + SwiperPlugin _getSwiperStyleByType(GoodsDetailsSlideBannerModel 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); + } + if ('type_point' == model.pagination) { + 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 null; + } + + /// 数字样式 + 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')), + 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))), + ]), + )), + ); + }); + } + + /// 自定义进度条 + 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 Align( + alignment: Alignment(0.0, 0.9), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: list.map((index) { + var borderRadius; + if (index == 0) { + 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)); + } + + if (index == config.activeIndex) { + borderRadius = BorderRadius.all(Radius.circular(2)); + } + + return Container( + height: 4, + width: 25, + decoration: BoxDecoration(borderRadius: borderRadius, color: index == config.activeIndex ? HexColor.fromHex(selectColor) : HexColor.fromHex(unselectColor)), + ); + }).toList(), + ), + ); + }); + } + + /// 圆形进度条 + 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)); + } +} diff --git a/lib/widgets/goods_details/slide_banner/model/goods_details_silde_banner_model.dart b/lib/widgets/goods_details/slide_banner/model/goods_details_silde_banner_model.dart new file mode 100644 index 0000000..40f1dd9 --- /dev/null +++ b/lib/widgets/goods_details/slide_banner/model/goods_details_silde_banner_model.dart @@ -0,0 +1,61 @@ + + +class GoodsDetailsSlideBannerModel { + String pagination; + String pagination_open; + List pagination_options; + List index_carousel_list; + String pagination_select_color; + String pagination_unselect_color; + + GoodsDetailsSlideBannerModel({this.pagination, this.pagination_open, this.pagination_options, this.pagination_select_color, this.pagination_unselect_color, this.index_carousel_list}); + + factory GoodsDetailsSlideBannerModel.fromJson(Map json) { + return GoodsDetailsSlideBannerModel( + pagination: json['pagination'], + pagination_open: json['pagination_open'], + pagination_options: json['pagination_options'] != null ? new List.from(json['pagination_options']) : null, + index_carousel_list: json['index_carousel_list'] != null ? (json['index_carousel_list'] as List).map((i) => IndexCarousel.fromJson(i)).toList() : null, + pagination_select_color: json['pagination_select_color'], + pagination_unselect_color: json['pagination_unselect_color'], + + ); + } + + Map toJson() { + final Map data = new Map(); + data['pagination'] = this.pagination; + data['pagination_open'] = this.pagination_open; + data['pagination_select_color'] = this.pagination_select_color; + data['pagination_unselect_color'] = this.pagination_unselect_color; + if (this.pagination_options != null) { + data['pagination_options'] = this.pagination_options; + } + if (this.index_carousel_list != null) { + data['index_carousel_list'] = this.index_carousel_list.map((v) => v.toJson()).toList(); + } + return data; + } +} + + +class IndexCarousel { + String img; + String skip_identifier; + + IndexCarousel({this.img, this.skip_identifier}); + + factory IndexCarousel.fromJson(Map json) { + return IndexCarousel( + img: json['img'], + skip_identifier: json['skip_identifier'], + ); + } + + Map toJson() { + final Map data = new Map(); + data['img'] = this.img; + data['skip_identifier'] = this.skip_identifier; + return data; + } +} \ No newline at end of file diff --git a/lib/widgets/goods_details/store/bloc/bloc.dart b/lib/widgets/goods_details/store/bloc/bloc.dart new file mode 100644 index 0000000..38113a3 --- /dev/null +++ b/lib/widgets/goods_details/store/bloc/bloc.dart @@ -0,0 +1,4 @@ + +export 'store_bloc.dart'; +export 'store_event.dart'; +export 'store_state.dart'; \ No newline at end of file diff --git a/lib/widgets/goods_details/store/bloc/store_bloc.dart b/lib/widgets/goods_details/store/bloc/store_bloc.dart new file mode 100644 index 0000000..37a23fd --- /dev/null +++ b/lib/widgets/goods_details/store/bloc/store_bloc.dart @@ -0,0 +1,43 @@ +import 'dart:async'; +import 'package:bloc/bloc.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/store/bloc/store_repository.dart'; +import 'package:zhiying_comm/util/empty_util.dart' + ''; + +import 'bloc.dart'; + +class StoreBloc extends Bloc { + StoreRepository repository; + + StoreBloc({this.repository}); + + @override + StoreState get initialState => StoreInitial(); + + @override + Stream mapEventToState( + StoreEvent event, + ) async* { + + /// 初始化 + if(event is StoreInitEvent){ + yield* _mapInitEventToState(event); + } + } + + + /// 获取数据 + Stream _mapInitEventToState(StoreInitEvent event) async*{ + var result = await repository.fetchParentData(event); + if(!EmptyUtil.isEmpty(result)){ + yield StoreLoadedState(model: result); + return; + } + var net = await repository.fetchNetData(event); + if(!EmptyUtil.isEmpty(net)) + yield StoreLoadedState(model: result); + else + yield StoreErrorState(); + } + +} diff --git a/lib/widgets/goods_details/store/bloc/store_event.dart b/lib/widgets/goods_details/store/bloc/store_event.dart new file mode 100644 index 0000000..f7c8642 --- /dev/null +++ b/lib/widgets/goods_details/store/bloc/store_event.dart @@ -0,0 +1,11 @@ +import 'package:equatable/equatable.dart'; + +abstract class StoreEvent extends Equatable { + const StoreEvent(); +} + +/// 初始化事件 +class StoreInitEvent extends StoreEvent { + @override + List get props => []; +} diff --git a/lib/widgets/goods_details/store/bloc/store_repository.dart b/lib/widgets/goods_details/store/bloc/store_repository.dart new file mode 100644 index 0000000..46d56ad --- /dev/null +++ b/lib/widgets/goods_details/store/bloc/store_repository.dart @@ -0,0 +1,10 @@ +import 'package:zhiying_base_widget/widgets/goods_details/store/bloc/bloc.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/store/model/store_model.dart'; + +class StoreRepository { + /// 获取上级数据 + Future fetchParentData(StoreInitEvent event) async {} + + /// 网络数据 + Future fetchNetData(StoreInitEvent event) async {} +} diff --git a/lib/widgets/goods_details/store/bloc/store_state.dart b/lib/widgets/goods_details/store/bloc/store_state.dart new file mode 100644 index 0000000..0148013 --- /dev/null +++ b/lib/widgets/goods_details/store/bloc/store_state.dart @@ -0,0 +1,27 @@ +import 'package:equatable/equatable.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/store/model/store_model.dart'; + +abstract class StoreState extends Equatable { + const StoreState(); +} + +class StoreInitial extends StoreState { + @override + List get props => []; +} + +/// 数据加载完毕 +class StoreLoadedState extends StoreState { + + final StoreModel model; + const StoreLoadedState({this.model}); + + @override + List get props => []; +} + +/// 数据加载出错 +class StoreErrorState extends StoreState { + @override + List get props => []; +} diff --git a/lib/widgets/goods_details/store/model/store_model.dart b/lib/widgets/goods_details/store/model/store_model.dart new file mode 100644 index 0000000..a3200a9 --- /dev/null +++ b/lib/widgets/goods_details/store/model/store_model.dart @@ -0,0 +1,3 @@ + + +class StoreModel{} \ No newline at end of file diff --git a/lib/widgets/goods_details/store/store_sk.dart b/lib/widgets/goods_details/store/store_sk.dart new file mode 100644 index 0000000..c3017bc --- /dev/null +++ b/lib/widgets/goods_details/store/store_sk.dart @@ -0,0 +1,44 @@ +import 'package:shimmer/shimmer.dart'; +import 'package:flutter/material.dart'; + +class StoreSkeleton extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Container( + height: 50, + width: double.infinity, + child: Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + + /// 图片 + _shimmerWidget(width: 50, height: 50), + + /// + Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + + _shimmerWidget(width: 150, height: 20), + _shimmerWidget(width: 50, height: 15) + + ], + ), + + ], + ), + ); + } + + Widget _shimmerWidget({double width, double height, double radius = 0}) { + return Shimmer.fromColors( + baseColor: Colors.grey[300], + highlightColor: Colors.grey[100], + child: Container( + width: width, + height: height, + decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(radius)), + ), + ); + } +} diff --git a/lib/widgets/goods_details/store/store_widget.dart b/lib/widgets/goods_details/store/store_widget.dart new file mode 100644 index 0000000..de3e999 --- /dev/null +++ b/lib/widgets/goods_details/store/store_widget.dart @@ -0,0 +1,147 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/store/bloc/bloc.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/store/bloc/store_repository.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/store/model/store_model.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +import 'store_sk.dart'; + +/// +/// 商家widget +/// +class StoreWidget extends StatelessWidget { + final Map model; + + const StoreWidget(this.model); + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (_) => StoreBloc(repository: StoreRepository())..add(StoreInitEvent()), + child: StoreContainer(), + ); + } +} + +class StoreContainer extends StatefulWidget { + @override + _StoreContainerState createState() => _StoreContainerState(); +} + +class _StoreContainerState extends State { + + /// 点击更多 + void _onMoreClick(){ + + } + + /// 点击商家 + void _onStoreClick(){ + + } + + @override + Widget build(BuildContext context) { + return BlocConsumer( + listener: (context, state) {}, + buildWhen: (prev, current) { + if (current is StoreErrorState) { + return false; + } + return true; + }, + builder: (context, state) { + if (state is StoreLoadedState) { + return _getMianWidget(state.model); + } + return StoreSkeleton(); + }, + ); + } + + /// 主视图 + Widget _getMianWidget(StoreModel model) { + return Container( + margin: const EdgeInsets.only(left: 12.5, right: 12.5), + child: Row( + children: [ + /// 商家图片 + _getStoreImgWidget(model), + + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + /// 商店名称与更多 + _getStoreNameWidget(model), + + /// 评分描述 + _getEvaluateWidget(model), + ], + ), + ), + ], + ), + ); + } + + /// 商家图片 + Widget _getStoreImgWidget(StoreModel model) { + return Container( + width: 50, + height: 50, + color: Colors.red, + ); + } + + /// 商店名称 + Widget _getStoreNameWidget(StoreModel model) { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + /// 商店名称 + Text( + '品胜京东自营旗舰店', + style: TextStyle(color: HexColor.fromHex('#333333'), fontSize: 13), + ), + + /// 更多 + Text( + '更多店铺优惠 >', + style: TextStyle(color: HexColor.fromHex('#FF4242'), fontSize: 11), + ), + ], + ); + } + + /// 评分描述 + Widget _getEvaluateWidget(StoreModel model) { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + /// 宝贝描述 5.0 + _getCoustomWidet('宝贝描述 5.0', '#999999', ''), + + /// 物流服务 5.0 + _getCoustomWidet('宝贝描述 5.0', '#999999', ''), + + /// 服务态度 1.0 + _getCoustomWidet('宝贝描述 5.0', '#999999', ''), + ], + ); + } + + Widget _getCoustomWidet(String text, String textColor, String icon) { + return Row( + children: [ + Text(text, style: TextStyle(fontSize: 11, color: HexColor.fromHex(textColor))), + Container( + width: 12, + height: 12, + color: Colors.red, + ), + ], + ); + } +} diff --git a/lib/widgets/goods_details/title/goods_details_title_widget.dart b/lib/widgets/goods_details/title/goods_details_title_widget.dart new file mode 100644 index 0000000..17a9a32 --- /dev/null +++ b/lib/widgets/goods_details/title/goods_details_title_widget.dart @@ -0,0 +1,48 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +/// +/// 商品详情标题 +/// +class GoodsDetailsTitleWidget extends StatelessWidget { + final Map model; + + const GoodsDetailsTitleWidget(this.model); + + @override + Widget build(BuildContext context) { + return Container( + width: double.infinity, + margin: const EdgeInsets.only(left: 12.5, right: 12.5), + child: _getMaiWidget(), + ); + } + + /// 主widget + Widget _getMaiWidget() { + return RichText( + maxLines: 2, + overflow: TextOverflow.ellipsis, + text: TextSpan(children: [ + WidgetSpan( + child: _getGoodsTypeIcon(), + ), + _getGoodsTitle(), + ]), + ); + } + + /// 商品类型图标 + Widget _getGoodsTypeIcon() { + return Container( + height: 15, + width: 32, + color: Colors.red, + ); + } + + /// 商品标题 + InlineSpan _getGoodsTitle() { + return TextSpan(text: '品胜（PISEN）苹果数据线1.5米 适用于苹果手机所有机型 MFI认证安全稳定一年换新1.5米2米', style: TextStyle(fontSize: 14, color: HexColor.fromHex('#FF333333'))); + } +} diff --git a/lib/widgets/goods_details/upgrade_tip/model/upgrade_tip_model.dart b/lib/widgets/goods_details/upgrade_tip/model/upgrade_tip_model.dart new file mode 100644 index 0000000..0d86b2f --- /dev/null +++ b/lib/widgets/goods_details/upgrade_tip/model/upgrade_tip_model.dart @@ -0,0 +1,3 @@ + +class UpgradeTipModel{} + diff --git a/lib/widgets/goods_details/upgrade_tip/upgrade_tip_sk.dart b/lib/widgets/goods_details/upgrade_tip/upgrade_tip_sk.dart new file mode 100644 index 0000000..b576576 --- /dev/null +++ b/lib/widgets/goods_details/upgrade_tip/upgrade_tip_sk.dart @@ -0,0 +1,27 @@ + +import 'package:shimmer/shimmer.dart'; +import 'package:flutter/material.dart'; + +class UpgradeTipSkeleton extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Container( + margin: const EdgeInsets.symmetric(horizontal: 12.5), + height: 35, + child: _shimmerWidget(width: double.infinity, height: double.infinity, radius: 20), + ); + } + + Widget _shimmerWidget({double width, double height, double radius = 0}) { + return Shimmer.fromColors( + baseColor: Colors.grey[300], + highlightColor: Colors.grey[100], + child: Container( + width: width, + height: height, + decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(radius)), + ), + ); + } +} + diff --git a/lib/widgets/goods_details/upgrade_tip/upgrade_tip_widget.dart b/lib/widgets/goods_details/upgrade_tip/upgrade_tip_widget.dart new file mode 100644 index 0000000..9f9e69e --- /dev/null +++ b/lib/widgets/goods_details/upgrade_tip/upgrade_tip_widget.dart @@ -0,0 +1,57 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_base_widget/widgets/goods_details/upgrade_tip/model/upgrade_tip_model.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +/// +/// 更新提示widget +/// +class UpgradeTipWidget extends StatelessWidget { + final Map model; + + const UpgradeTipWidget(this.model); + + @override + Widget build(BuildContext context) { + return Container( + decoration: BoxDecoration( + color: HexColor.fromHex('#FFEFDA'), + borderRadius: BorderRadius.circular(30), + ), + padding: const EdgeInsets.only(left: 10, right: 13, top: 10, bottom: 10), + margin: const EdgeInsets.symmetric(horizontal: 12.5), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + _geLeftWidget(null), + _getRightWidget(null), + ], + ), + ); + } + + /// 左边的视图 + Widget _geLeftWidget(UpgradeTipModel model) { + return Row( + children: [ + /// 图标 + Container(width: 15, height: 15, color: Colors.red), + + const SizedBox(width: 7.5), + + /// 文字 + Text('下载APP升级运营商，享受更多收益', style: TextStyle(color: HexColor.fromHex('#C09023'), fontSize: 11)) + ], + ); + } + + /// 右边的视图 + Widget _getRightWidget(UpgradeTipModel model) { + return Row( + children: [ + Text('前往下载', style: TextStyle(color: HexColor.fromHex('#C09023'), fontSize: 11)), + const SizedBox(width: 4), + Text('》', style: TextStyle(color: HexColor.fromHex('#C09023'), fontSize: 11)) + ], + ); + } +} diff --git a/lib/widgets/home/home_ai_dialog/home_ai_dialog.dart b/lib/widgets/home/home_ai_dialog/home_ai_dialog.dart new file mode 100644 index 0000000..f84b59a --- /dev/null +++ b/lib/widgets/home/home_ai_dialog/home_ai_dialog.dart @@ -0,0 +1,9 @@ +import 'package:flutter/material.dart'; + + +class HomeAiDialog extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Container(); + } +} diff --git a/lib/widgets/home/home_banner/home_banner_widget.dart b/lib/widgets/home/home_banner/home_banner_widget.dart index bda962a..34ca54b 100644 --- a/lib/widgets/home/home_banner/home_banner_widget.dart +++ b/lib/widgets/home/home_banner/home_banner_widget.dart @@ -45,6 +45,7 @@ class _HomeBannerContainerState extends State { /// 点击事件 void _itemOnClick(HomeBannerListItemModel model){ print('${model?.skip_identifier}'); + RouterUtil.route(model.toJson(), context); } @override diff --git a/lib/widgets/home/home_notice/bloc/bloc.dart b/lib/widgets/home/home_notice/bloc/bloc.dart new file mode 100644 index 0000000..d68273b --- /dev/null +++ b/lib/widgets/home/home_notice/bloc/bloc.dart @@ -0,0 +1,3 @@ +export 'home_notice_bloc.dart'; +export 'home_notice_event.dart'; +export 'home_notice_state.dart'; \ No newline at end of file diff --git a/lib/widgets/home/home_notice/bloc/home_notice_bloc.dart b/lib/widgets/home/home_notice/bloc/home_notice_bloc.dart new file mode 100644 index 0000000..56a2cab --- /dev/null +++ b/lib/widgets/home/home_notice/bloc/home_notice_bloc.dart @@ -0,0 +1,32 @@ +import 'dart:async'; +import 'package:bloc/bloc.dart'; +import 'package:zhiying_base_widget/widgets/home/home_notice/bloc/home_notice_repository.dart'; +import 'package:zhiying_comm/util/empty_util.dart'; +import 'bloc.dart'; + +class HomeNoticeBloc extends Bloc { + HomeNoticeRepository repository; + + HomeNoticeBloc({this.repository}); + + @override + HomeNoticeState get initialState => HomeNoticeInitial(); + + @override + Stream mapEventToState( + HomeNoticeEvent event, + ) async* { + if(event is HomeNoticeInitEvent){ + yield* _mapInitEventToState(event); + } + } + + /// 初始化 + Stream _mapInitEventToState(HomeNoticeInitEvent event) async* { + var parentData = await repository.fetchParentData(event); + if(!EmptyUtil.isEmpty(parentData)) + yield HomeNoticeLoadedState(model: parentData); + else + yield HomeNoticeErrorState(); + } +} diff --git a/lib/widgets/home/home_notice/bloc/home_notice_event.dart b/lib/widgets/home/home_notice/bloc/home_notice_event.dart new file mode 100644 index 0000000..7b5c1e0 --- /dev/null +++ b/lib/widgets/home/home_notice/bloc/home_notice_event.dart @@ -0,0 +1,16 @@ +import 'package:equatable/equatable.dart'; +import 'bloc.dart'; + +abstract class HomeNoticeEvent extends Equatable { + const HomeNoticeEvent(); + @override + List get props => []; +} + +/// 初始化事件 +class HomeNoticeInitEvent extends HomeNoticeEvent{ + final Map model; + const HomeNoticeInitEvent({this.model}); + @override + List get props => [this.model]; +} \ No newline at end of file diff --git a/lib/widgets/home/home_notice/bloc/home_notice_repository.dart b/lib/widgets/home/home_notice/bloc/home_notice_repository.dart new file mode 100644 index 0000000..c17af8c --- /dev/null +++ b/lib/widgets/home/home_notice/bloc/home_notice_repository.dart @@ -0,0 +1,18 @@ +import 'dart:convert'; + +import 'package:zhiying_base_widget/widgets/home/home_notice/bloc/bloc.dart'; +import 'package:zhiying_base_widget/widgets/home/home_notice/model/home_notice_model.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +class HomeNoticeRepository { + /// 获取父页面的数据 + Future fetchParentData(HomeNoticeInitEvent event) async { + try { + String jsonStr = event.model['data']; + return HomeNoticeModel.fromJson(jsonDecode(jsonStr)); + } catch (e) { + Logger.log(e); + } + return null; + } +} diff --git a/lib/widgets/home/home_notice/bloc/home_notice_state.dart b/lib/widgets/home/home_notice/bloc/home_notice_state.dart new file mode 100644 index 0000000..e6e4dd3 --- /dev/null +++ b/lib/widgets/home/home_notice/bloc/home_notice_state.dart @@ -0,0 +1,30 @@ +import 'package:equatable/equatable.dart'; +import 'package:zhiying_base_widget/widgets/home/home_notice/model/home_notice_model.dart'; +import 'bloc.dart'; + +abstract class HomeNoticeState extends Equatable { + const HomeNoticeState(); + @override + List get props => []; +} + +/// 初始化事件 +class HomeNoticeInitial extends HomeNoticeState { + @override + List get props => []; +} + +/// 数据加载完毕 +class HomeNoticeLoadedState extends HomeNoticeState { + final HomeNoticeModel model; + + const HomeNoticeLoadedState({this.model}); + + @override + List get props => [this.model]; +} + +/// 数据加载出错 +class HomeNoticeErrorState extends HomeNoticeState{ + +} diff --git a/lib/widgets/home/home_notice/home_notice_sk.dart b/lib/widgets/home/home_notice/home_notice_sk.dart new file mode 100644 index 0000000..32e21f8 --- /dev/null +++ b/lib/widgets/home/home_notice/home_notice_sk.dart @@ -0,0 +1,28 @@ +import 'package:shimmer/shimmer.dart'; +import 'package:flutter/material.dart'; + +/// +/// 公告的骨架屏 +/// +class HomeNoticeSkeleton extends StatelessWidget { + final Map map; + + const HomeNoticeSkeleton({this.map}); + + @override + Widget build(BuildContext context) { + return Container(padding: const EdgeInsets.symmetric(horizontal: 12.5), child: _shimmerWidget(width: double.infinity, height: 30, radius: 8)); + } + + Widget _shimmerWidget({double width, double height, double radius = 0}) { + return Shimmer.fromColors( + baseColor: Colors.grey[300], + highlightColor: Colors.grey[100], + child: Container( + width: width, + height: height, + decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(radius)), + ), + ); + } +} diff --git a/lib/widgets/home/home_notice/home_notice_widget.dart b/lib/widgets/home/home_notice/home_notice_widget.dart new file mode 100644 index 0000000..7a93f70 --- /dev/null +++ b/lib/widgets/home/home_notice/home_notice_widget.dart @@ -0,0 +1,203 @@ +import 'dart:async'; + +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:zhiying_base_widget/widgets/home/home_notice/bloc/home_notice_repository.dart'; +import 'package:zhiying_base_widget/widgets/home/home_notice/home_notice_sk.dart'; +import 'package:cached_network_image/cached_network_image.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; +import 'package:zhiying_base_widget/widgets/home/home_notice/model/home_notice_model.dart'; +import 'bloc/bloc.dart'; + +/// +/// 公告滚动widget +/// +class HomeNoticeWidget extends StatelessWidget { + final Map model; + + const HomeNoticeWidget(this.model); + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (_) => HomeNoticeBloc(repository: HomeNoticeRepository())..add(HomeNoticeInitEvent(model: model)), + child: HomeNoticeWidgetContianer(), + ); + } +} + +class HomeNoticeWidgetContianer extends StatefulWidget { + @override + _HomeNoticeWidgetContianerState createState() => _HomeNoticeWidgetContianerState(); +} + +class _HomeNoticeWidgetContianerState extends State { + + /// 子item点击事件 + void _itemOnClick(HomeNoticeModel model) { + if(pageIndex == model.notices.length){ + pageIndex = 0; + } + print('===== $pageIndex'); + HomeNoticeNoticesModel item = model.notices[pageIndex]; + _itemJump(item); + } + + /// 子item跳转 + void _itemJump(HomeNoticeNoticesModel model){ + print('${model?.skip_identifier}'); + RouterUtil.route(model.toJson(), context); + } + + @override + Widget build(BuildContext context) { + return BlocConsumer( + listener: (context, state) {}, + buildWhen: (prev, current) { + return true; + }, + builder: (context, state) { + if (state is HomeNoticeLoadedState) { + return _getMainWidget(state?.model); + } + return HomeNoticeSkeleton(); + }, + ); + } + + /// 主体页面 + Widget _getMainWidget(HomeNoticeModel model) { + return Container( + width: double.infinity, + decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.only(bottomLeft: Radius.circular(7.5), bottomRight: Radius.circular(7.5))), + padding: const EdgeInsets.only(bottom: 7.5), + child: Container( + decoration: BoxDecoration(borderRadius: BorderRadius.circular(7.5), color: HexColor.fromHex(model?.bg_color)), + // color: Colors.cyan), + margin: const EdgeInsets.only(left: 12.5, right: 12.5), + padding: const EdgeInsets.only(top: 8, bottom: 8, left: 12, right: 8), + // height: 30, + width: double.infinity, + child: _getChildWidget(model), + ), + ); + } + + var pageIndex = 0; + + Widget _getChildWidget(HomeNoticeModel model) { + return GestureDetector( + onTap: () => _itemOnClick(model), + behavior: HitTestBehavior.opaque, + child: Row( + children: [ + /// 图片 + // Container(width: 52, height: 13, color: Colors.red), + CachedNetworkImage( + imageUrl: model?.logo_img ?? '', + width: 52, + ), + const SizedBox(width: 14), + + /// 文字 + Expanded( + child: Container( + width: double.infinity, + height: 15, + alignment: Alignment.centerLeft, + // color: Colors.yellowAccent, + child: MarqueeWidget( + model?.notices?.length ?? 0, + (BuildContext context, int index) { + HomeNoticeNoticesModel item = model.notices[index]; + return Align(alignment: Alignment.centerLeft, child: Text('${item?.notice_text}' , style: TextStyle(color: HexColor.fromHex(model?.text_color), fontSize: 12))); + }, + onPageChanged: (index) => pageIndex = index, + ), + ), + ), + const SizedBox(width: 14), + + /// 图片 + CachedNetworkImage(imageUrl: model?.jump_img ?? '', height: 18), + // Container( + // width: 18, + // height: 18, + // color: Colors.red, + // ), + ], + ), + ); + } +} + +// 上下滚动的消息轮播 +class MarqueeWidget extends StatefulWidget { + int count; // 子视图数量 + IndexedWidgetBuilder itemBuilder; // 子视图构造器 + final ValueChanged onPageChanged; + + MarqueeWidget(this.count, this.itemBuilder, {this.onPageChanged}); + + @override + _MarqueeWidgetState createState() => _MarqueeWidgetState(); +} + +class _MarqueeWidgetState extends State { + PageController _controller; + Timer _timer; + + @override + void initState() { + super.initState(); + + if (widget.count > 1) { + _controller = PageController(); + _timer = Timer.periodic(Duration(seconds: 5), (timer) { + // 如果当前位于最后一页，则直接跳转到第一页，两者内容相同，跳转时视觉上无感知 + if (_controller.page.round() >= widget.count) { + _controller.jumpToPage(0); + } + _controller.nextPage(duration: Duration(seconds: 1), curve: Curves.linear); + }); + } + } + + @override + Widget build(BuildContext context) { + // return PageView.builder( + // scrollDirection: Axis.vertical, + // controller: _controller, + // itemBuilder: (buildContext, index) { + // if (index < widget.count) { + // return widget.itemBuilder(buildContext, index); + // } else { + // return widget.itemBuilder(buildContext, 0); + // } + // }, + // itemCount: widget.count + 1, // 在原数据末尾添加一笔数据(即第一笔数据)，用于实现无限循环滚动效果 + // ); + // } + + return PageView.custom( + physics: NeverScrollableScrollPhysics(), + childrenDelegate: SliverChildBuilderDelegate((context, index) { + if (index < widget.count) { + return widget.itemBuilder(context, index); + } else { + return widget.itemBuilder(context, 0); + } + }, childCount: widget.count + 1), + scrollDirection: Axis.vertical, + controller: _controller, + onPageChanged: widget?.onPageChanged, + ); + } + + @override + void dispose() { + super.dispose(); + _controller?.dispose(); + _timer?.cancel(); + } +} diff --git a/lib/widgets/home/home_notice/model/home_notice_model.dart b/lib/widgets/home/home_notice/model/home_notice_model.dart new file mode 100644 index 0000000..1ce3866 --- /dev/null +++ b/lib/widgets/home/home_notice/model/home_notice_model.dart @@ -0,0 +1,58 @@ +class HomeNoticeModel { + String logo_img; + String jump_img; + String bg_color; + String text_color; + String duration_time; + + List notices; + + HomeNoticeModel({this.notices, this.logo_img, this.jump_img, this.bg_color, this.text_color, this.duration_time}); + + factory HomeNoticeModel.fromJson(Map json) { + return HomeNoticeModel( + logo_img: json['logo_img']?.toString(), + jump_img: json['jump_img']?.toString(), + bg_color: json['bg_color']?.toString(), + text_color: json['text_color']?.toString(), + duration_time: json['duration_time']?.toString(), + notices: json['notices'] != null ? (json['notices'] as List).map((i) => HomeNoticeNoticesModel.fromJson(i)).toList() : null, + ); + } + + Map toJson() { + final Map data = new Map(); + + data['duration_time'] = this.duration_time; + data['text_color'] = this.text_color; + data['bg_color'] = this.bg_color; + data['jump_img'] = this.jump_img; + data['logo_img'] = this.logo_img; + + if (this.notices != null) { + data['notices'] = this.notices.map((v) => v.toJson()).toList(); + } + return data; + } +} + +class HomeNoticeNoticesModel { + String notice_text; + String skip_identifier; + + HomeNoticeNoticesModel({this.notice_text, this.skip_identifier}); + + factory HomeNoticeNoticesModel.fromJson(Map json) { + return HomeNoticeNoticesModel( + notice_text: json['notice_text']?.toString(), + skip_identifier: json['skip_identifier']?.toString(), + ); + } + + Map toJson() { + final Map data = new Map(); + data['img'] = this.notice_text; + data['skip_identifier'] = this.skip_identifier; + return data; + } +} diff --git a/lib/widgets/home/home_quick_entry/home_quick_entry.dart b/lib/widgets/home/home_quick_entry/home_quick_entry.dart index 6d9723a..8689a25 100644 --- a/lib/widgets/home/home_quick_entry/home_quick_entry.dart +++ b/lib/widgets/home/home_quick_entry/home_quick_entry.dart @@ -32,8 +32,9 @@ class HomeQuickEntryContianer extends StatefulWidget { class _HomeQuickEntryContianerState extends State { /// Icon点击事件 - void _itemIconClick(TypeNormal item){ - print("item type = ${item.skip_identifier}"); + void _itemIconClick(TypeNormal model){ + print("item type = ${model.skip_identifier}"); + RouterUtil.route(model.toJson(), context); } @override @@ -250,6 +251,7 @@ class _HomeQuickEntryContianerState extends State { SwiperPagination _swiperPaginationDot(HomeQuickEntryModel model){ return SwiperPagination(margin: const EdgeInsets.only(), builder: DotSwiperPaginationBuilder( color: HexColor.fromHex(model?.pagination_unselect_color), activeColor: HexColor.fromHex(model?.pagination_select_color), size: 8, activeSize: 8)); } + // 自定义进度条 条形 SwiperPlugin _swiperCustomPagination(int pageCount) { List list = []; diff --git a/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_bloc.dart b/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_bloc.dart index 5b6b786..12d2c6d 100644 --- a/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_bloc.dart +++ b/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_bloc.dart @@ -9,8 +9,7 @@ import 'package:zhiying_comm/util/empty_util.dart'; import './bloc.dart'; -class HomeSlideBannerBloc - extends Bloc { +class HomeSlideBannerBloc extends Bloc { HomeSlideBannerRepository repository; HomeSlideBannerBloc({@required this.repository}); @@ -19,8 +18,7 @@ class HomeSlideBannerBloc HomeSlideBannerState get initialState => InitialHomeSlideBannerState(); @override - Stream mapEventToState( - HomeSlideBannerEvent event) async* { + Stream mapEventToState(HomeSlideBannerEvent event) async* { final currentState = state; /// 初始化 @@ -31,11 +29,14 @@ class HomeSlideBannerBloc } /// 初始化 - Stream _mapInitEventToState( - HomeBannerInitEvent event) async* { + Stream _mapInitEventToState(HomeBannerInitEvent event) async* { + var parent = await repository.fetchPreantData(event.model); + if(!EmptyUtil.isEmpty(parent)){ + yield HomeSlideBannerLoadedState(datas: parent); + return; + } var cached = await repository.fetchCachedDate(id: event.model['mod_id']); - if (!EmptyUtil.isEmpty(cached)) - yield HomeSlideBannerCachedState(datas: cached); + if (!EmptyUtil.isEmpty(cached)) yield HomeSlideBannerCachedState(datas: cached); var param = await repository.fetchData(id: event.model['mod_id']); if (!EmptyUtil.isEmpty(param)) yield HomeSlideBannerLoadedState(datas: param); diff --git a/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_repository.dart b/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_repository.dart index a396ff9..37a978a 100644 --- a/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_repository.dart +++ b/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_repository.dart @@ -1,3 +1,5 @@ +import 'dart:convert'; + import 'package:flutter/cupertino.dart'; import 'package:zhiying_base_widget/widgets/home/home_slide_banner/model/home_slide_banner_model.dart'; import 'package:zhiying_comm/util/empty_util.dart'; @@ -6,33 +8,42 @@ import 'package:zhiying_comm/util/net_util.dart'; class HomeSlideBannerRepository { /// 获取缓存数据 - Future> fetchCachedDate({@required int id}) async { + Future fetchCachedDate({@required int id}) async { var cached = await NetUtil.getRequestCachedData('/api/v1/mod', params: { 'ids': [id] }); if (!EmptyUtil.isEmpty(cached)) { - HomeSlideBannerModel model = HomeSlideBannerModel.fromJson(cached); - if (null != model && !EmptyUtil.isEmpty(model.items)) { - return model.items; + try { + return HomeSlideBannerModel.fromJson(cached); + }catch(e){ } + } return null; } /// 获取父页面传进来的数据 - + Future fetchPreantData(@required Map model) async{ + try{ + if(!EmptyUtil.isEmpty(model)){ + return HomeSlideBannerModel.fromJson(jsonDecode(model['data'])); + } + }catch(e){ + } + return null; + } /// 获取数据 - Future> fetchData({@required int id}) async { + Future fetchData({@required int id}) async { var params = await NetUtil.post('/api/v1/mod', params: { 'ids': [id] }, cache: true); if (NetUtil.isSuccess(params) && !EmptyUtil.isEmpty(params[GlobalConfig.HTTP_RESPONSE_KEY_DATA])) { - HomeSlideBannerModel model = HomeSlideBannerModel.fromJson(params[GlobalConfig.HTTP_RESPONSE_KEY_DATA]); - if (null != model && !EmptyUtil.isEmpty(model.items)) { - return model.items; + try{ + return HomeSlideBannerModel.fromJson(params[GlobalConfig.HTTP_RESPONSE_KEY_DATA]); + }catch(e){ } } return null; diff --git a/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_state.dart b/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_state.dart index 5765ab1..e53e534 100644 --- a/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_state.dart +++ b/lib/widgets/home/home_slide_banner/bloc/home_slide_banner_state.dart @@ -16,7 +16,7 @@ class InitialHomeSlideBannerState extends HomeSlideBannerState { /// 缓存数据 class HomeSlideBannerCachedState extends HomeSlideBannerState { - List datas; + HomeSlideBannerModel datas; HomeSlideBannerCachedState({this.datas}); @@ -26,12 +26,11 @@ class HomeSlideBannerCachedState extends HomeSlideBannerState { /// 数据加载完毕状态 class HomeSlideBannerLoadedState extends HomeSlideBannerState { - List datas; + HomeSlideBannerModel datas; HomeSlideBannerLoadedState({this.datas}); - HomeSlideBannerLoadedState copyWith( - {List newData}) { + HomeSlideBannerLoadedState copyWith({HomeSlideBannerModel newData}) { return HomeSlideBannerLoadedState( datas: newData ?? datas, ); 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 5bdbc73..9c1fd78 100644 --- a/lib/widgets/home/home_slide_banner/home_slide_banner.dart +++ b/lib/widgets/home/home_slide_banner/home_slide_banner.dart @@ -2,6 +2,7 @@ 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'; @@ -39,9 +40,14 @@ class HomeSlideBannerContainer extends StatefulWidget { } class _HomeSlideBannerContainerState extends State { + /// 子元素点击事件 - void _itemOnClick(HomeSlideBannerModelItems items) { - print('点击了 $items'); + void _itemOnClick(IndexCarousel model) { + print('点击了 $model'); + // RouterUtil.route(model.toJson(), context); + Navigator.push(context, MaterialPageRoute( + builder: (_) => PageFactory.create('goods_details', null) + )); } @override @@ -73,26 +79,26 @@ class _HomeSlideBannerContainerState extends State { ); } - Widget _getMainWidget(List datas) { + Widget _getMainWidget(HomeSlideBannerModel datas) { return Container( width: double.infinity, height: 140, child: Swiper( itemBuilder: (BuildContext context, int index) { - HomeSlideBannerModelItems items = datas[index]; + IndexCarousel items = datas.index_carousel_list[index]; return Container( - // color: Colors.primaries[index % Colors.primaries.length], width: double.infinity, child: CachedNetworkImage( - imageUrl: items?.img?? '', + imageUrl: items?.img ?? '', fit: BoxFit.cover, ), ); }, - itemCount: datas?.length ?? 0, + itemCount: datas?.index_carousel_list?.length ?? 0, loop: true, - onTap: (index) => _itemOnClick(datas[index]), - pagination: _SwiperCustomPagination(datas?.length ?? 0), + autoplay: true, + onTap: (index) => _itemOnClick(datas.index_carousel_list[index]), + pagination: _getSwiperStyleByType(datas, datas?.index_carousel_list?.length ?? 0), onIndexChanged: (index) { print('切换下一页'); Provider.of(context, listen: false).switchBg(Container( @@ -105,8 +111,45 @@ class _HomeSlideBannerContainerState extends State { ); } + /// 获取进度样式 + 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); + } + if ('type_point' == model.pagination) { + 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 null; + } + + /// 数字样式 + 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')), + 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))), + ]), + )), + ); + }); + } + /// 自定义进度条 - SwiperPlugin _SwiperCustomPagination(int pageCount) { + SwiperPlugin _swiperCustomPagination(int pageCount, String selectColor, String unselectColor) { List list = []; for (int i = 0; i < pageCount; i++) { list.add(i); @@ -134,11 +177,16 @@ class _HomeSlideBannerContainerState extends State { return Container( height: 4, width: 25, - decoration: BoxDecoration(borderRadius: borderRadius, color: index == config.activeIndex ? HexColor.fromHex('#FF4242') : HexColor.fromHex('#FFFFFF')), + decoration: BoxDecoration(borderRadius: borderRadius, color: index == config.activeIndex ? HexColor.fromHex(selectColor) : HexColor.fromHex(unselectColor)), ); }).toList(), ), ); }); } + + /// 圆形进度条 + 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)); + } } diff --git a/lib/widgets/home/home_slide_banner/model/home_slide_banner_model.dart b/lib/widgets/home/home_slide_banner/model/home_slide_banner_model.dart index cdcda54..9165299 100644 --- a/lib/widgets/home/home_slide_banner/model/home_slide_banner_model.dart +++ b/lib/widgets/home/home_slide_banner/model/home_slide_banner_model.dart @@ -1,115 +1,58 @@ + class HomeSlideBannerModel { - List items; + List index_carousel_list; + String pagination; + String pagination_open; + List pagination_options; + String pagination_select_color; + String pagination_unselect_color; - HomeSlideBannerModel({this.items}); + HomeSlideBannerModel({this.index_carousel_list, this.pagination, this.pagination_open, this.pagination_options, this.pagination_select_color, this.pagination_unselect_color}); - HomeSlideBannerModel.fromJson(Map json) { - if (json['6'] != null) { - items = new List(); - json['6'].forEach((v) { - items.add(new HomeSlideBannerModelItems.fromJson(v)); - }); + factory HomeSlideBannerModel.fromJson(Map json) { + return HomeSlideBannerModel( + index_carousel_list: json['index_carousel_list'] != null ? (json['index_carousel_list'] as List).map((i) => IndexCarousel.fromJson(i)).toList() : null, + pagination: json['pagination'], + pagination_open: json['pagination_open'], + pagination_options: json['pagination_options'] != null ? new List.from(json['pagination_options']) : null, + pagination_select_color: json['pagination_select_color'], + pagination_unselect_color: json['pagination_unselect_color'], + ); } - } - Map toJson() { - final Map data = new Map(); - if (this.items != null) { - data['6'] = this.items.map((v) => v.toJson()).toList(); + Map toJson() { + final Map data = new Map(); + data['pagination'] = this.pagination; + data['pagination_open'] = this.pagination_open; + data['pagination_select_color'] = this.pagination_select_color; + data['pagination_unselect_color'] = this.pagination_unselect_color; + if (this.index_carousel_list != null) { + data['index_carousel_list'] = this.index_carousel_list.map((v) => v.toJson()).toList(); + } + if (this.pagination_options != null) { + data['pagination_options'] = this.pagination_options; + } + return data; } - return data; - } } -class HomeSlideBannerModelItems { - String modId; - String modPid; - String modName; - String position; - String title; - String subtitle; - String url; - String margin; - String aspectRatio; - String icon; - String img; - String fontColor; - String bgImg; - String bgColor; - String bgColorT; - String badge; - String path; - String data; - String sort; - String isGlobal; +class IndexCarousel { + String img; + String skip_identifier; - HomeSlideBannerModelItems( - {this.modId, - this.modPid, - this.modName, - this.position, - this.title, - this.subtitle, - this.url, - this.margin, - this.aspectRatio, - this.icon, - this.img, - this.fontColor, - this.bgImg, - this.bgColor, - this.bgColorT, - this.badge, - this.path, - this.data, - this.sort, - this.isGlobal}); + IndexCarousel({this.img, this.skip_identifier}); - HomeSlideBannerModelItems.fromJson(Map json) { - modId = json['mod_id']?.toString(); - modPid = json['mod_pid']?.toString(); - modName = json['mod_name']?.toString(); - position = json['position']?.toString(); - title = json['title']?.toString(); - subtitle = json['subtitle']?.toString(); - url = json['url']?.toString(); - margin = json['margin']?.toString(); - aspectRatio = json['aspect_ratio']?.toString(); - icon = json['icon']?.toString(); - img = json['img']?.toString(); - fontColor = json['font_color']?.toString(); - bgImg = json['bg_img']?.toString(); - bgColor = json['bg_color']?.toString(); - bgColorT = json['bg_color_t']?.toString(); - badge = json['badge']?.toString(); - path = json['path']?.toString(); - data = json['data']?.toString(); - sort = json['sort']?.toString(); - isGlobal = json['is_global']?.toString(); - } + factory IndexCarousel.fromJson(Map json) { + return IndexCarousel( + img: json['img'], + skip_identifier: json['skip_identifier'], + ); + } - Map toJson() { - final Map data = new Map(); - data['mod_id'] = this.modId; - data['mod_pid'] = this.modPid; - data['mod_name'] = this.modName; - data['position'] = this.position; - data['title'] = this.title; - data['subtitle'] = this.subtitle; - data['url'] = this.url; - data['margin'] = this.margin; - data['aspect_ratio'] = this.aspectRatio; - data['icon'] = this.icon; - data['img'] = this.img; - data['font_color'] = this.fontColor; - data['bg_img'] = this.bgImg; - data['bg_color'] = this.bgColor; - data['bg_color_t'] = this.bgColorT; - data['badge'] = this.badge; - data['path'] = this.path; - data['data'] = this.data; - data['sort'] = this.sort; - data['is_global'] = this.isGlobal; - return data; - } -} + Map toJson() { + final Map data = new Map(); + data['img'] = this.img; + data['skip_identifier'] = this.skip_identifier; + return data; + } +} \ No newline at end of file diff --git a/lib/widgets/home/home_sreach/home_sreach_creater.dart b/lib/widgets/home/home_sreach/home_sreach_creater.dart new file mode 100644 index 0000000..6102cbd --- /dev/null +++ b/lib/widgets/home/home_sreach/home_sreach_creater.dart @@ -0,0 +1,22 @@ +import 'package:flutter/material.dart'; +import 'package:zhiying_base_widget/widgets/home/home_sreach/home_sreach_widget.dart'; +import 'package:zhiying_base_widget/widgets/others/normal_nav/normal_nav.dart'; +import 'package:zhiying_comm/zhiying_comm.dart'; + +class HomeSreachCreater extends WidgetCreater { + @override + List createWidgets(Map model) { + return [ + SliverPersistentHeader( + pinned: false, + floating: false, + delegate: HomeSreachDeleagater(), + ), + ]; + } + + @override + bool isSliverChild() { + return true; + } +} diff --git a/lib/widgets/home/home_sreach/home_sreach_sk.dart b/lib/widgets/home/home_sreach/home_sreach_sk.dart new file mode 100644 index 0000000..e3748aa --- /dev/null +++ b/lib/widgets/home/home_sreach/home_sreach_sk.dart @@ -0,0 +1,21 @@ +import 'package:shimmer/shimmer.dart'; +import 'package:flutter/material.dart'; + +class HomeSreachSkeleton extends StatelessWidget { + @override + Widget build(BuildContext context) { + return Container(); + } + + Widget _shimmerWidget({double width, double height, double radius = 0}) { + return Shimmer.fromColors( + baseColor: Colors.grey[300], + highlightColor: Colors.grey[100], + child: Container( + width: width, + height: height, + decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(radius)), + ), + ); + } +} diff --git a/lib/widgets/home/home_sreach/home_sreach_widget.dart b/lib/widgets/home/home_sreach/home_sreach_widget.dart new file mode 100644 index 0000000..c99d7d8 --- /dev/null +++ b/lib/widgets/home/home_sreach/home_sreach_widget.dart @@ -0,0 +1,119 @@ +import 'package:zhiying_comm/zhiying_comm.dart'; +import 'package:flutter/material.dart'; +import 'dart:ui'; + +class HomeSreachDeleagater extends SliverPersistentHeaderDelegate{ + + double _height; + + HomeSreachDeleagater() : super() { + _height = MediaQueryData.fromWindow(window).padding.top + 44; + } + + @override + Widget build(BuildContext context, double shrinkOffset, bool overlapsContent) { + print('${shrinkOffset.toString()}'); + double percent = shrinkOffset / _height; + print('${percent.toString()}'); + return HomeSreachWidget(null); + } + + @override + double get maxExtent => _height; + + @override + double get minExtent => _height; + + @override + bool shouldRebuild(SliverPersistentHeaderDelegate oldDelegate) { + return false; + } + +} + + +/// +/// 首页搜索框 +/// +class HomeSreachWidget extends StatelessWidget { + final Map model; + + const HomeSreachWidget(this.model); + + @override + Widget build(BuildContext context) { + return HomeSreachContainer(); + } +} + +class HomeSreachContainer extends StatefulWidget { + @override + _HomeSreachContainerState createState() => _HomeSreachContainerState(); +} + +class _HomeSreachContainerState extends State { + @override + Widget build(BuildContext context) { + return _getMainWidget(); + } + + /// 主视图 + Widget _getMainWidget() { + return Container( + color: Colors.transparent, + height: 30, + width: double.infinity, + margin: EdgeInsets.only(left: 12.5, right: 12.5, bottom: 10, top: MediaQueryData.fromWindow(window).padding.top + 10), + child: Row( + children: [ + /// 搜索框 + Expanded( + child: _getSreachWidget(), + ), + const SizedBox(width: 10), + + /// 消息 + _getMessageWidget(), + ], + ), + ); + } + + /// 搜索栏 + Widget _getSreachWidget() { + return Container( + height: 30, + width: double.infinity, + child: TextField( + autofocus: false, + style: TextStyle(color: HexColor.fromHex('#FFFFFF'), fontSize: 14), + readOnly: true, + decoration: InputDecoration( + hintText: '输入搜索内容，领券省钱', + hintStyle: TextStyle( + color: Colors.white, + fontSize: 14, + ), + contentPadding: EdgeInsets.zero, + prefixIcon: Icon( + Icons.search, + color: Colors.white, + ), + filled: true, + fillColor: Color(0x50cccccc), + focusedBorder: OutlineInputBorder(borderSide: BorderSide(color: Color(0x00000000)), borderRadius: BorderRadius.all(Radius.circular(30))), + enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Color(0x00000000)), borderRadius: BorderRadius.all(Radius.circular(30))), + ), + ), + ); + } + + /// 消息widget + Widget _getMessageWidget() { + return Container( + width: 30, + height: 30, + color: Colors.red, + ); + } +}