From f586478c6dc12ab6195d2438e913493f08ae7261 Mon Sep 17 00:00:00 2001 From: zhang <494089941@qq.com> Date: Thu, 21 Jan 2021 09:27:02 +0800 Subject: [PATCH] add image horizontal view --- lib/base/base_style.dart | 2 +- lib/pages/things_page/fixed_submit_page.dart | 34 +--- lib/utils/bee_map.dart | 2 +- lib/widget/horizontal_image_view.dart | 40 +++++ pubspec.lock | 176 +++++++++++-------- pubspec.yaml | 4 +- 6 files changed, 149 insertions(+), 109 deletions(-) create mode 100644 lib/widget/horizontal_image_view.dart diff --git a/lib/base/base_style.dart b/lib/base/base_style.dart index a29e8d40..0c1dbbf0 100644 --- a/lib/base/base_style.dart +++ b/lib/base/base_style.dart @@ -7,7 +7,7 @@ const ktextSubColor = Color(0xff666666); const kForeGroundColor = Color(0xFFFFFFFF); const kPrimaryColor=Color(0xFFFFC40C); const kDarkPrimaryColor=Color(0xFFFF8200); - +const kDangerColor=Color(0xFFFF3B30); class BaseStyle { ///字体类 static final double fontSize18 = 18.sp; diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart index cccbca5a..608e9fd6 100644 --- a/lib/pages/things_page/fixed_submit_page.dart +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -5,12 +5,12 @@ import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; import 'package:akuCommunity/pages/things_page/widget/image_grid.dart'; import 'package:akuCommunity/utils/bee_map.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:akuCommunity/widget/horizontal_image_view.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/extensions/num_ext.dart'; -import 'package:akuCommunity/extensions/widget_list_ext.dart'; class FixedSubmitPage extends StatefulWidget { FixedSubmitPage({Key key}) : super(key: key); @@ -45,7 +45,7 @@ class _FixedSubmitPageState extends State { case 7: return ktextSubColor; default: - return kPrimaryColor; + return kDangerColor; } } @@ -88,7 +88,7 @@ class _FixedSubmitPageState extends State { .make(), 16.hb, model.imgUrls.length != 0 - ? ImageGrid(List.generate( + ? HorizontalImageView(List.generate( model.imgUrls.length, (index) => model.imgUrls[index].url)) : SizedBox(), ], @@ -100,34 +100,6 @@ class _FixedSubmitPageState extends State { Widget build(BuildContext context) { return BeeScaffold( title: '报事报修', - // body: Column( - // children: [ - // Expanded( - // child: ListView( - // padding: EdgeInsets.all(32.w), - // children: [ - // ..._model - // .map((e) => _buildCard(e.tag, e.state, e.text, e.images)) - // .toList() - // ].sepWidget(separate: 24.hb), - // ), - // ), - // Padding( - // padding: - // EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom), - // child: MaterialButton( - // color: kPrimaryColor, - // onPressed: () {}, - // child: '新增'.text.bold.color(ktextPrimary).size(32.sp).make(), - // minWidth: double.infinity, - // height: 98.w, - // elevation: 0, - // materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, - // padding: EdgeInsets.zero, - // ), - // ) - // ], - // ), body: Column( children: [ BeeListView( diff --git a/lib/utils/bee_map.dart b/lib/utils/bee_map.dart index 139ff6f1..bb8d3832 100644 --- a/lib/utils/bee_map.dart +++ b/lib/utils/bee_map.dart @@ -4,5 +4,5 @@ class BeeMap { 2: '家庭报修', }; - Map fixState = {1: '待分配', 2: '未接单', 3: '处理中',4:'已处理',5:'已完成',6:'已关闭',7:'已作废'}; + Map fixState = {1: '待分配', 2: '未接单', 3: '处理中',4:'已处理',5:'已完成',6:'已关闭',7:'已作废',8:'未知'}; } diff --git a/lib/widget/horizontal_image_view.dart b/lib/widget/horizontal_image_view.dart new file mode 100644 index 00000000..0d272974 --- /dev/null +++ b/lib/widget/horizontal_image_view.dart @@ -0,0 +1,40 @@ +import 'package:akuCommunity/constants/api.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/rendering.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:akuCommunity/const/resource.dart'; + +class HorizontalImageView extends StatefulWidget { + final List urls; + HorizontalImageView( + this.urls, { + Key key, + }) : super(key: key); + + @override + _HorizontalImageViewState createState() => _HorizontalImageViewState(); +} + +class _HorizontalImageViewState extends State { + @override + Widget build(BuildContext context) { + return Container( + height: 184.w + 24.w, + child: ListView.builder( + scrollDirection: Axis.horizontal, + itemBuilder: (context, index) { + return Padding( + padding: EdgeInsets.all(16.w), + child: ClipRRect( + borderRadius: BorderRadius.circular(8.w), + child: FadeInImage.assetNetwork( + placeholder: R.ASSETS_IMAGES_DRAWINGS_PNG, + image: API.resource + widget.urls[index], + ), + ), + ); + }, + ), + ); + } +} diff --git a/pubspec.lock b/pubspec.lock index 1ebc203a..038e0f47 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -14,28 +14,28 @@ packages: name: amap_core_fluttify url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.0" + version: "0.14.0" amap_location_fluttify: dependency: "direct main" description: name: amap_location_fluttify url: "https://pub.flutter-io.cn" source: hosted - version: "0.18.0" + version: "0.20.0" amap_map_fluttify: dependency: "direct main" description: name: amap_map_fluttify url: "https://pub.flutter-io.cn" source: hosted - version: "0.29.0" + version: "0.30.1" amap_search_fluttify: dependency: transitive description: name: amap_search_fluttify url: "https://pub.flutter-io.cn" source: hosted - version: "0.14.0" + version: "0.16.2" analyzer: dependency: transitive description: @@ -56,7 +56,7 @@ packages: name: ansicolor url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.5" + version: "1.1.1" archive: dependency: transitive description: @@ -105,7 +105,7 @@ packages: name: cached_network_image url: "https://pub.flutter-io.cn" source: hosted - version: "2.3.1" + version: "2.5.0" characters: dependency: transitive description: @@ -126,14 +126,14 @@ packages: name: chewie url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.10" + version: "0.12.1+1" chewie_audio: dependency: transitive description: name: chewie_audio url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.0+1" + version: "1.1.1" cli_util: dependency: transitive description: @@ -182,14 +182,14 @@ packages: name: core_location_fluttify url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.1" + version: "0.6.0" crypto: dependency: transitive description: name: crypto url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.4" + version: "2.1.5" css_colors: dependency: transitive description: @@ -259,14 +259,14 @@ packages: name: extended_text url: "https://pub.flutter-io.cn" source: hosted - version: "4.0.0" + version: "4.1.0" extended_text_library: dependency: transitive description: name: extended_text_library url: "https://pub.flutter-io.cn" source: hosted - version: "4.0.0" + version: "4.0.3" fake_async: dependency: transitive description: @@ -308,7 +308,7 @@ packages: name: fluro url: "https://pub.flutter-io.cn" source: hosted - version: "1.6.3" + version: "1.7.8" flustars: dependency: "direct main" description: @@ -341,7 +341,7 @@ packages: name: flutter_cache_manager url: "https://pub.flutter-io.cn" source: hosted - version: "1.4.1" + version: "2.1.1" flutter_datetime_picker: dependency: "direct main" description: @@ -362,7 +362,7 @@ packages: name: flutter_html url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.2" + version: "1.2.0" flutter_icons: dependency: "direct main" description: @@ -370,6 +370,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" + flutter_layout_grid: + dependency: transitive + description: + name: flutter_layout_grid + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.10.3" flutter_localizations: dependency: "direct main" description: flutter @@ -416,7 +423,7 @@ packages: name: flutter_svg url: "https://pub.flutter-io.cn" source: hosted - version: "0.18.1" + version: "0.19.1" flutter_swiper: dependency: "direct main" description: @@ -440,21 +447,21 @@ packages: name: fluwx url: "https://pub.flutter-io.cn" source: hosted - version: "2.3.0" + version: "2.5.0+1" font_awesome_flutter: dependency: "direct main" description: name: font_awesome_flutter url: "https://pub.flutter-io.cn" source: hosted - version: "8.8.1" + version: "8.11.0" foundation_fluttify: dependency: transitive description: name: foundation_fluttify url: "https://pub.flutter-io.cn" source: hosted - version: "0.9.10+1" + version: "0.11.1" get: dependency: "direct main" description: @@ -489,7 +496,7 @@ packages: name: html url: "https://pub.flutter-io.cn" source: hosted - version: "0.14.0+3" + version: "0.14.0+4" http: dependency: transitive description: @@ -517,7 +524,7 @@ packages: name: image url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.14" + version: "2.1.19" image_stack: dependency: "direct main" description: @@ -525,6 +532,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.1.0" + import_js_library: + dependency: transitive + description: + name: import_js_library + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.0.2" intl: dependency: transitive description: @@ -552,7 +566,7 @@ packages: name: json_annotation url: "https://pub.flutter-io.cn" source: hosted - version: "3.0.1" + version: "3.1.1" latlong: dependency: "direct main" description: @@ -608,27 +622,20 @@ packages: name: node_interop url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.1" + version: "1.2.1" node_io: dependency: transitive description: name: node_io url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.1" + version: "1.2.0" octo_image: dependency: transitive description: name: octo_image url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.1" - open_iconic_flutter: - dependency: transitive - description: - name: open_iconic_flutter - url: "https://pub.flutter-io.cn" - source: hosted version: "0.3.0" package_config: dependency: transitive @@ -671,7 +678,7 @@ packages: name: path_provider url: "https://pub.flutter-io.cn" source: hosted - version: "1.6.18" + version: "1.6.27" path_provider_linux: dependency: transitive description: @@ -685,28 +692,28 @@ packages: name: path_provider_macos url: "https://pub.flutter-io.cn" source: hosted - version: "0.0.4+3" + version: "0.0.4+8" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.3" + version: "1.0.4" path_provider_windows: dependency: transitive description: name: path_provider_windows url: "https://pub.flutter-io.cn" source: hosted - version: "0.0.4+1" + version: "0.0.4+3" pedantic: dependency: transitive description: name: pedantic url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.0" + version: "1.9.2" permission_handler: dependency: "direct main" description: @@ -727,14 +734,14 @@ packages: name: petitparser url: "https://pub.flutter-io.cn" source: hosted - version: "3.0.4" + version: "3.1.0" photo_view: dependency: "direct main" description: name: photo_view url: "https://pub.flutter-io.cn" source: hosted - version: "0.10.2" + version: "0.10.3" platform: dependency: transitive description: @@ -742,20 +749,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.2.1" - platform_detect: - dependency: transitive - description: - name: platform_detect - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.4.0" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.2" + version: "1.0.3" process: dependency: transitive description: @@ -769,7 +769,7 @@ packages: name: provider url: "https://pub.flutter-io.cn" source: hosted - version: "4.3.2+1" + version: "4.3.3" pub_semver: dependency: transitive description: @@ -805,6 +805,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "3.2.0" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.1.5" random_character: dependency: "direct main" description: @@ -841,35 +848,28 @@ packages: name: rxdart url: "https://pub.flutter-io.cn" source: hosted - version: "0.24.1" - screen: - dependency: transitive - description: - name: screen - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.0.5" + version: "0.25.0" shared_preferences: dependency: transitive description: name: shared_preferences url: "https://pub.flutter-io.cn" source: hosted - version: "0.5.10" + version: "0.5.12+4" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.flutter-io.cn" source: hosted - version: "0.0.2+2" + version: "0.0.2+4" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.flutter-io.cn" source: hosted - version: "0.0.1+10" + version: "0.0.1+11" shared_preferences_platform_interface: dependency: transitive description: @@ -884,6 +884,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.1.2+7" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.0.1+3" shimmer: dependency: "direct main" description: @@ -930,14 +937,14 @@ packages: name: sqflite url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.1+1" + version: "1.3.2+2" sqflite_common: dependency: transitive description: name: sqflite_common url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.2+1" + version: "1.0.3" stack_trace: dependency: transitive description: @@ -1001,6 +1008,13 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0-nullsafety.3" + uni_map_platform_interface: + dependency: transitive + description: + name: uni_map_platform_interface + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.0.13" url_launcher: dependency: "direct main" description: @@ -1014,28 +1028,28 @@ packages: name: url_launcher_linux url: "https://pub.flutter-io.cn" source: hosted - version: "0.0.1+1" + version: "0.0.1+4" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.flutter-io.cn" source: hosted - version: "0.0.1+7" + version: "0.0.1+9" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.8" + version: "1.0.9" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.3+1" + version: "0.1.5+1" uuid: dependency: transitive description: @@ -1070,28 +1084,42 @@ packages: name: video_player url: "https://pub.flutter-io.cn" source: hosted - version: "0.10.12+2" + version: "1.0.1" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.1" + version: "2.2.0" video_player_web: dependency: transitive description: name: video_player_web url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.3+2" + version: "0.1.4+1" wakelock: dependency: transitive description: name: wakelock url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.4+2" + version: "0.2.1+1" + wakelock_platform_interface: + dependency: transitive + description: + name: wakelock_platform_interface + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.1.0+1" + wakelock_web: + dependency: transitive + description: + name: wakelock_web + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.1.0+3" watcher: dependency: transitive description: @@ -1112,28 +1140,28 @@ packages: name: webview_flutter url: "https://pub.flutter-io.cn" source: hosted - version: "0.3.22+1" + version: "1.0.7" win32: dependency: transitive description: name: win32 url: "https://pub.flutter-io.cn" source: hosted - version: "1.7.3" + version: "1.7.4" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.0" + version: "0.1.2" xml: dependency: transitive description: name: xml url: "https://pub.flutter-io.cn" source: hosted - version: "4.2.0" + version: "4.5.1" yaml: dependency: transitive description: @@ -1142,5 +1170,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.10.0 <2.11.0" - flutter: ">=1.20.0 <2.0.0" + dart: ">=2.10.2 <2.11.0" + flutter: ">=1.22.2 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 92054b7f..855610f2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: # 版本信息 package_info: 0.4.1 #上拉加载 - pull_to_refresh: ^1.6.2 + pull_to_refresh: 1.6.2 # 状态管理 flutter_redux: ^0.5.3 provider: ^4.1.3 @@ -37,7 +37,7 @@ dependencies: # icons flutter_icons: 1.1.0 extended_image: 0.9.0 - extended_text: 4.0.0 + extended_text: 4.1.0 #轮播图 flutter_swiper: ^1.1.6 #路由