From 14e2bb68e34869a9b6995c2ffc83c8c477616670 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Mon, 29 Mar 2021 15:46:48 +0800 Subject: [PATCH] remove shit code --- ios/Podfile.lock | 113 +++++------------- .../contents.xcworkspacedata | 2 +- .../goods_details/widget/product_swiper.dart | 88 +++++++------- lib/pages/home/widget/home_swiper.dart | 104 ++++++++-------- lib/pages/personal/look_logistics_page.dart | 28 ++--- pubspec.lock | 31 +---- pubspec.yaml | 9 +- 7 files changed, 144 insertions(+), 231 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 56fe612f..dd7973e7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,36 +1,15 @@ PODS: - - AMap3DMap-NO-IDFA (7.6.0): - - AMapFoundation-NO-IDFA (~> 1.6.3) - - amap_core_fluttify (0.0.1): - - AMapFoundation-NO-IDFA (~> 1.6.4) + - AMap3DMap (7.8.0): + - AMapFoundation (~> 1.6.4) + - amap_flutter_location (0.0.1): + - AMapLocation (~> 2.6.7) - Flutter - - foundation_fluttify - - amap_location_fluttify (0.0.1): - - amap_core_fluttify - - AMapLocation-NO-IDFA (= 2.6.7) + - amap_flutter_map (0.0.1): + - AMap3DMap - Flutter - - foundation_fluttify - - amap_map_fluttify (0.0.1): - - AMap3DMap-NO-IDFA (= 7.6.0) - - amap_core_fluttify - - amap_location_fluttify - - amap_search_fluttify - - Flutter - - foundation_fluttify - - url_launcher - - amap_search_fluttify (0.0.1): - - amap_core_fluttify - - AMapSearch-NO-IDFA (~> 7.3.0) - - Flutter - - foundation_fluttify - - AMapFoundation-NO-IDFA (1.6.4) - - AMapLocation-NO-IDFA (2.6.7): - - AMapFoundation-NO-IDFA (~> 1.6.4) - - AMapSearch-NO-IDFA (7.3.0): - - AMapFoundation-NO-IDFA (~> 1.6.3) - - core_location_fluttify (0.0.1): - - Flutter - - foundation_fluttify + - AMapFoundation (1.6.5.1) + - AMapLocation (2.6.7): + - AMapFoundation (~> 1.6.4) - device_info (0.0.1): - Flutter - Flutter (1.0.0) @@ -40,8 +19,6 @@ PODS: - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - - foundation_fluttify (0.0.1): - - Flutter - image_picker (0.0.1): - Flutter - JCore (2.4.0) @@ -55,7 +32,7 @@ PODS: - Flutter - path_provider (0.0.1): - Flutter - - "permission_handler (5.0.1+1)": + - "permission_handler (5.1.0+2)": - Flutter - shared_preferences (0.0.1): - Flutter @@ -64,24 +41,14 @@ PODS: - FMDB (>= 2.7.5) - url_launcher (0.0.1): - Flutter - - video_player (0.0.1): - - Flutter - - wakelock (0.0.1): - - Flutter - - webview_flutter (0.0.1): - - Flutter - WechatOpenSDK (1.8.7.1) DEPENDENCIES: - - amap_core_fluttify (from `.symlinks/plugins/amap_core_fluttify/ios`) - - amap_location_fluttify (from `.symlinks/plugins/amap_location_fluttify/ios`) - - amap_map_fluttify (from `.symlinks/plugins/amap_map_fluttify/ios`) - - amap_search_fluttify (from `.symlinks/plugins/amap_search_fluttify/ios`) - - core_location_fluttify (from `.symlinks/plugins/core_location_fluttify/ios`) + - amap_flutter_location (from `.symlinks/plugins/amap_flutter_location/ios`) + - amap_flutter_map (from `.symlinks/plugins/amap_flutter_map/ios`) - device_info (from `.symlinks/plugins/device_info/ios`) - Flutter (from `Flutter`) - fluwx (from `.symlinks/plugins/fluwx/ios`) - - foundation_fluttify (from `.symlinks/plugins/foundation_fluttify/ios`) - image_picker (from `.symlinks/plugins/image_picker/ios`) - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`) - package_info (from `.symlinks/plugins/package_info/ios`) @@ -90,40 +57,28 @@ DEPENDENCIES: - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) - - video_player (from `.symlinks/plugins/video_player/ios`) - - wakelock (from `.symlinks/plugins/wakelock/ios`) - - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`) SPEC REPOS: trunk: - - AMap3DMap-NO-IDFA - - AMapFoundation-NO-IDFA - - AMapLocation-NO-IDFA - - AMapSearch-NO-IDFA + - AMap3DMap + - AMapFoundation + - AMapLocation - FMDB - JCore - JPush - WechatOpenSDK EXTERNAL SOURCES: - amap_core_fluttify: - :path: ".symlinks/plugins/amap_core_fluttify/ios" - amap_location_fluttify: - :path: ".symlinks/plugins/amap_location_fluttify/ios" - amap_map_fluttify: - :path: ".symlinks/plugins/amap_map_fluttify/ios" - amap_search_fluttify: - :path: ".symlinks/plugins/amap_search_fluttify/ios" - core_location_fluttify: - :path: ".symlinks/plugins/core_location_fluttify/ios" + amap_flutter_location: + :path: ".symlinks/plugins/amap_flutter_location/ios" + amap_flutter_map: + :path: ".symlinks/plugins/amap_flutter_map/ios" device_info: :path: ".symlinks/plugins/device_info/ios" Flutter: :path: Flutter fluwx: :path: ".symlinks/plugins/fluwx/ios" - foundation_fluttify: - :path: ".symlinks/plugins/foundation_fluttify/ios" image_picker: :path: ".symlinks/plugins/image_picker/ios" jpush_flutter: @@ -140,41 +95,27 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/sqflite/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" - video_player: - :path: ".symlinks/plugins/video_player/ios" - wakelock: - :path: ".symlinks/plugins/wakelock/ios" - webview_flutter: - :path: ".symlinks/plugins/webview_flutter/ios" SPEC CHECKSUMS: - AMap3DMap-NO-IDFA: 5e5b483ef230d1bed6c8d989d36254a66c67a6fc - amap_core_fluttify: 832331914f028c32aebf1dab23474a82aff828e8 - amap_location_fluttify: baa3007e3f215456ab2ea2f4ccccf5bc1a9a164b - amap_map_fluttify: 6b64256d6ccea7813e1b6423fcf7b5ef10d3c984 - amap_search_fluttify: f83f950b4f8e8688bc8b100684c33868335f2e06 - AMapFoundation-NO-IDFA: 68a24362b110b8e0a3677605d0fd36bdf521f2bb - AMapLocation-NO-IDFA: 2a3edfee336b38481b892e1ecc85df0f6b365851 - AMapSearch-NO-IDFA: 85555dc9ba312949d39a259baa4ef4e0619fa944 - core_location_fluttify: 9466a411ea7d22c6349c7e6a767ae4623f01eb1d + AMap3DMap: 3e4fac78e3e023cefd47e7d7715ef5ea69bfd0fa + amap_flutter_location: 3e33b57f1aad80b0dfb4b399de857a1a9f071e62 + amap_flutter_map: 979e54d227cedac6c7504a2151bfbf3bcf96760a + AMapFoundation: b67560a6f21aab81c8c12f84616b55a3833b6253 + AMapLocation: a46c30d9930d0f3a3bd21139d8f845d10ac3f01d device_info: d7d233b645a32c40dfdc212de5cf646ca482f175 - Flutter: 0e3d915762c693b495b44d77113d4970485de6ec + Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - foundation_fluttify: 0c45145e3fad1fb99188e4979daed5b24cd9b278 - image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09 + image_picker: 50e7c7ff960e5f58faa4d1f4af84a771c671bc4a JCore: a29e4b0ee54e1301446dc02d8e1c350404108b34 JPush: defaa108c38806f6efdcfaf4c416854d25fca8e5 jpush_flutter: 364b245849348e05377d67295d0896ddd664a896 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c - permission_handler: eac8e15b4a1a3fba55b761d19f3f4e6b005d15b6 + permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef - video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e - wakelock: bfc7955c418d0db797614075aabbc58a39ab5107 - webview_flutter: d2b4d6c66968ad042ad94cbb791f5b72b4678a96 WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a16..919434a6 100644 --- a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/lib/pages/goods_details/widget/product_swiper.dart b/lib/pages/goods_details/widget/product_swiper.dart index ef5ff9d0..1f950ab6 100644 --- a/lib/pages/goods_details/widget/product_swiper.dart +++ b/lib/pages/goods_details/widget/product_swiper.dart @@ -4,7 +4,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:flutter_swiper/flutter_swiper.dart'; +// import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:akuCommunity/utils/fade_route.dart'; import 'package:akuCommunity/widget/gallery_photo_view_wrapper.dart'; @@ -31,49 +31,49 @@ class ProductSwiper extends StatelessWidget { Widget build(BuildContext context) { return Container( height: 500.w, - child: Swiper( - itemBuilder: (BuildContext context, int index) { - return AspectRatio( - aspectRatio: 1, - child: GalleryExampleItemThumbnail( - galleryExampleItem: imageModel()[index], - onTap: () { - Navigator.of(context).push(new FadeRoute( - page: GalleryPhotoViewWrapper( - galleryItems: imageModel(), - backgroundDecoration: const BoxDecoration( - color: Colors.black, - ), - initialIndex: index, - ), - )); - }, - ), - ); - }, - itemCount: 3, - scrollDirection: Axis.horizontal, - autoplay: true, - duration: 600, - onTap: (index) { - debugPrint("点击了第:$index个"); - }, - controller: SwiperController(), - pagination: SwiperPagination( - // 分页指示器 - alignment: Alignment.bottomCenter, // 位置 Alignment.bottomCenter 底部中间 - margin: const EdgeInsets.fromLTRB(0, 0, 0, 5), // 距离调整 - builder: DotSwiperPaginationBuilder( - activeColor: Color(0xffFEC200), - color: Colors.white, - size: 15.w, - activeSize: 25.w, - space: 10.w, - ), - ), - autoplayDelay: 5000, - autoplayDisableOnInteraction: true, - ), + // child: Swiper( + // itemBuilder: (BuildContext context, int index) { + // return AspectRatio( + // aspectRatio: 1, + // child: GalleryExampleItemThumbnail( + // galleryExampleItem: imageModel()[index], + // onTap: () { + // Navigator.of(context).push(new FadeRoute( + // page: GalleryPhotoViewWrapper( + // galleryItems: imageModel(), + // backgroundDecoration: const BoxDecoration( + // color: Colors.black, + // ), + // initialIndex: index, + // ), + // )); + // }, + // ), + // ); + // }, + // itemCount: 3, + // scrollDirection: Axis.horizontal, + // autoplay: true, + // duration: 600, + // onTap: (index) { + // debugPrint("点击了第:$index个"); + // }, + // controller: SwiperController(), + // pagination: SwiperPagination( + // // 分页指示器 + // alignment: Alignment.bottomCenter, // 位置 Alignment.bottomCenter 底部中间 + // margin: const EdgeInsets.fromLTRB(0, 0, 0, 5), // 距离调整 + // builder: DotSwiperPaginationBuilder( + // activeColor: Color(0xffFEC200), + // color: Colors.white, + // size: 15.w, + // activeSize: 25.w, + // space: 10.w, + // ), + // ), + // autoplayDelay: 5000, + // autoplayDisableOnInteraction: true, + // ), ); } } diff --git a/lib/pages/home/widget/home_swiper.dart b/lib/pages/home/widget/home_swiper.dart index 86f088eb..ece3b0aa 100644 --- a/lib/pages/home/widget/home_swiper.dart +++ b/lib/pages/home/widget/home_swiper.dart @@ -1,7 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_swiper/flutter_swiper.dart'; +// import 'package:flutter_swiper/flutter_swiper.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/cached_image_wrapper.dart'; @@ -36,57 +36,57 @@ class _HomeSwiperState extends State { ), ), ), - Positioned( - top: 17.w, - left: 0, - right: 0, - bottom: -76.w, - child: Swiper( - itemBuilder: (BuildContext context, int index) { - return Container( - decoration: BoxDecoration( - color: Colors.white, - boxShadow: [ - BoxShadow( - color: Colors.grey.withOpacity(0.2), - offset: Offset(1.1, 1.1), - blurRadius: 10.0), - ], - ), - child: CachedImageWrapper( - url: imageList[index], - height: 240.w, - width: 686.w, - ), - ); - }, - itemCount: 3, - scrollDirection: Axis.horizontal, - viewportFraction: 0.8, - scale: 0.9, - autoplay: true, - duration: 600, - onTap: (index) { - debugPrint("点击了第:$index个"); - }, - controller: SwiperController(), - pagination: SwiperPagination( - // 分页指示器 - alignment: - Alignment.bottomCenter, // 位置 Alignment.bottomCenter 底部中间 - margin: const EdgeInsets.fromLTRB(0, 0, 0, 5), // 距离调整 - builder: DotSwiperPaginationBuilder( - activeColor: Color(0xffFEC200), - color: Colors.white, - size: 15.w, - activeSize: 20.w, - space: 10.w, - ), - ), - autoplayDelay: 5000, - autoplayDisableOnInteraction: true, - ), - ), + // Positioned( + // top: 17.w, + // left: 0, + // right: 0, + // bottom: -76.w, + // child: Swiper( + // itemBuilder: (BuildContext context, int index) { + // return Container( + // decoration: BoxDecoration( + // color: Colors.white, + // boxShadow: [ + // BoxShadow( + // color: Colors.grey.withOpacity(0.2), + // offset: Offset(1.1, 1.1), + // blurRadius: 10.0), + // ], + // ), + // child: CachedImageWrapper( + // url: imageList[index], + // height: 240.w, + // width: 686.w, + // ), + // ); + // }, + // itemCount: 3, + // scrollDirection: Axis.horizontal, + // viewportFraction: 0.8, + // scale: 0.9, + // autoplay: true, + // duration: 600, + // onTap: (index) { + // debugPrint("点击了第:$index个"); + // }, + // controller: SwiperController(), + // pagination: SwiperPagination( + // // 分页指示器 + // alignment: + // Alignment.bottomCenter, // 位置 Alignment.bottomCenter 底部中间 + // margin: const EdgeInsets.fromLTRB(0, 0, 0, 5), // 距离调整 + // builder: DotSwiperPaginationBuilder( + // activeColor: Color(0xffFEC200), + // color: Colors.white, + // size: 15.w, + // activeSize: 20.w, + // space: 10.w, + // ), + // ), + // autoplayDelay: 5000, + // autoplayDisableOnInteraction: true, + // ), + // ), ], ); } diff --git a/lib/pages/personal/look_logistics_page.dart b/lib/pages/personal/look_logistics_page.dart index 7ea6edd4..e2a29850 100644 --- a/lib/pages/personal/look_logistics_page.dart +++ b/lib/pages/personal/look_logistics_page.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter_icons/flutter_icons.dart'; import 'package:get/get.dart'; -import 'package:sliding_up_panel/sliding_up_panel.dart'; +// import 'package:sliding_up_panel/sliding_up_panel.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/utils/headers.dart'; @@ -31,19 +31,19 @@ class _LookLogisticsPageState extends State { alignment: Alignment.topCenter, children: [ _body(), - SlidingUpPanel( - margin: EdgeInsets.symmetric(horizontal: 32.w), - maxHeight: _panelHeightOpen, - minHeight: _panelHeightClosed, - parallaxEnabled: true, - parallaxOffset: .5, - // body: _body(), - panelBuilder: (sc) => _panel(sc), - borderRadius: BorderRadius.only( - topLeft: Radius.circular(8.0), - topRight: Radius.circular(8.0), - ), - ), + // SlidingUpPanel( + // margin: EdgeInsets.symmetric(horizontal: 32.w), + // maxHeight: _panelHeightOpen, + // minHeight: _panelHeightClosed, + // parallaxEnabled: true, + // parallaxOffset: .5, + // // body: _body(), + // panelBuilder: (sc) => _panel(sc), + // borderRadius: BorderRadius.only( + // topLeft: Radius.circular(8.0), + // topRight: Radius.circular(8.0), + // ), + // ), Positioned( top: 32.w + _statusHeight, child: Container( diff --git a/pubspec.lock b/pubspec.lock index 34c71057..e9f28f52 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -272,13 +272,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_page_indicator: - dependency: transitive - description: - name: flutter_page_indicator - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.0.3" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -307,13 +300,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "0.6.0-nullsafety.0" - flutter_swiper: - dependency: "direct main" - description: - name: flutter_swiper - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.1.6" flutter_test: dependency: "direct dev" description: flutter @@ -432,12 +418,10 @@ packages: jpush_flutter: dependency: "direct main" description: - path: "." - ref: HEAD - resolved-ref: c713c4be12073302b6f1b5c7a71199046a3ee47c - url: "http://159.75.73.143:8080/third_packages/jpush_flutter" - source: git - version: "0.6.3" + name: jpush_flutter + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.1" js: dependency: transitive description: @@ -788,13 +772,6 @@ packages: url: "https://pub.flutter-io.cn" source: hosted version: "2.0.0" - transformer_page_view: - dependency: transitive - description: - name: transformer_page_view - url: "https://pub.flutter-io.cn" - source: hosted - version: "0.1.6" typed_data: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 6695a3ed..b4342ca4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -28,8 +28,6 @@ dependencies: # TODO need remove flutter_icons: 1.1.0 extended_text: ^5.0.4 - #轮播图 - flutter_swiper: ^1.1.6 #图片预览 photo_view: ^0.11.1 #图片缓存 @@ -47,10 +45,9 @@ dependencies: shimmer: ^2.0.0-nullsafety.0 #随机二维码 qr_flutter: ^4.0.0 - + #用户存储路径 path_provider: ^2.0.1 - fluwx: ^3.3.0 get: ^4.0.0-nullsafety.2 @@ -67,9 +64,7 @@ dependencies: image_picker: ^0.7.3 power_logger: ^1.0.0-nullsafety.0 flutter_rating_bar: ^4.0.0 - jpush_flutter: - git: - url: http://159.75.73.143:8080/third_packages/jpush_flutter + jpush_flutter: ^2.0.1 badges: ^2.0.0-nullsafety.1 amap_flutter_map: