From 93ed8edca2ebbccaf459a92fecbf7ec6548097b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=90=8C?= <494089941@qq.com> Date: Thu, 5 May 2022 17:46:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3ios=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E9=87=8D=E6=9E=84=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .fvm/fvm_config.json | 2 +- ios/Podfile.lock | 108 ++++++++++-------- ios/Runner.xcodeproj/project.pbxproj | 6 +- ios/Runner/AppDelegate.swift | 8 +- ios/Runner/Runner-Bridging-Header.h | 2 + lib/pages/home/home_page.dart | 2 +- .../announce/announce_card.dart | 2 +- .../message_center_page/reply/reply_card.dart | 2 +- .../thumbs_up/thumbs_up_card.dart | 2 +- .../opening_code_page/opening_code_page.dart | 2 +- lib/pages/personal/user_profile_page.dart | 2 +- .../personal/wallet/balance_record_view.dart | 12 +- lib/pages/personal/wallet/pay_way_dialog.dart | 69 +++++------ .../personal/wallet/point_record_view.dart | 12 +- .../personal/wallet/wallet_recharge_page.dart | 9 +- lib/ui/community/activity/activity_card.dart | 2 +- .../activity/activity_detail_page.dart | 2 +- .../topic/topic_community_view.dart | 2 +- lib/ui/community/notice/notice_card.dart | 2 +- .../community/notice/notice_detail_page.dart | 2 +- .../task/hall/hall_card.dart | 4 +- .../task/publish_task_page.dart | 2 + .../work_order/publish_work_order_page.dart | 2 +- .../public_infomation_card.dart | 2 +- .../public_information_detail_page.dart | 2 +- .../category/new_category_sub_card.dart | 2 +- lib/ui/market/market_page.dart | 2 +- lib/ui/market/order/order_card.dart | 25 +++- lib/ui/market/order/order_detail_page.dart | 17 ++- .../search/submit_order_page_normal.dart | 12 +- lib/utils/network/net_util.dart | 2 +- ...ageNetwork.dart => bee_image_network.dart} | 0 lib/widget/others/stack_avatar.dart | 2 +- lib/widget/views/bee_hor_image_view.dart | 2 +- pubspec.lock | 9 +- 35 files changed, 195 insertions(+), 140 deletions(-) rename lib/widget/{beeImageNetwork.dart => bee_image_network.dart} (100%) diff --git a/.fvm/fvm_config.json b/.fvm/fvm_config.json index af9d3d51..99820951 100644 --- a/.fvm/fvm_config.json +++ b/.fvm/fvm_config.json @@ -1,4 +1,4 @@ { - "flutterSdkVersion": "2.8.0", + "flutterSdkVersion": "2.10.2", "flavors": {} } \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ad11d758..c88752e6 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,36 +1,43 @@ PODS: - advance_pdf_viewer (1.0.5): - Flutter - - AlipaySDK-iOS (15.7.9) - - AMap3DMap (8.0.0): - - AMapFoundation (~> 1.6.8) + - AMap3DMap (9.2.1): + - AMapFoundation (~> 1.6.9) - amap_flutter_location (0.0.1): - - AMapLocation (~> 2.6.7) + - AMapLocation - Flutter - amap_flutter_map (0.0.1): - AMap3DMap - Flutter - - AMapFoundation (1.6.8) - - AMapLocation (2.6.9): - - AMapFoundation (~> 1.6.8) + - AMapFoundation (1.6.9) + - AMapLocation (2.8.0): + - AMapFoundation (~> 1.6.9) + - audio_session (0.0.1): + - Flutter - device_info_plus (0.0.1): - Flutter - Flutter (1.0.0) + - flutter_sound (9.2.2): + - Flutter + - flutter_sound_core (= 9.2.2) + - flutter_sound_core (9.2.2) - fluwx (0.0.1): - Flutter - - WechatOpenSDK (= 1.8.7.1) + - WechatOpenSDK_Fuck (~> 1.9.2) - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - image_picker (0.0.1): - Flutter - - JCore (2.7.1) - - JPush (3.7.0): - - JCore (< 3.0.0, >= 2.0.0) + - JCore (3.1.0) + - JPush (4.4.0): + - JCore (>= 2.0.0) - jpush_flutter (0.0.2): - Flutter - - JCore (= 2.7.1) - - JPush (= 3.7.0) + - JCore (= 3.1.0) + - JPush (= 4.4.0) + - just_audio (0.0.1): + - Flutter - MTBBarcodeScanner (5.0.11) - open_file (0.0.1): - Flutter @@ -38,7 +45,7 @@ PODS: - Flutter - package_info_plus (0.4.5): - Flutter - - path_provider (0.0.1): + - path_provider_ios (0.0.1): - Flutter - "permission_handler (5.1.0+2)": - Flutter @@ -47,50 +54,52 @@ PODS: - MTBBarcodeScanner - share (0.0.1): - Flutter - - shared_preferences (0.0.1): + - sms_autofill (0.0.1): - Flutter - sqflite (0.0.2): - Flutter - FMDB (>= 2.7.5) - tobias (0.0.1): - - AlipaySDK-iOS (~> 15.7.9) - Flutter - - url_launcher (0.0.1): + - url_launcher_ios (0.0.1): - Flutter - - WechatOpenSDK (1.8.7.1) + - WechatOpenSDK_Fuck (1.9.2) DEPENDENCIES: - advance_pdf_viewer (from `.symlinks/plugins/advance_pdf_viewer/ios`) - amap_flutter_location (from `.symlinks/plugins/amap_flutter_location/ios`) - amap_flutter_map (from `.symlinks/plugins/amap_flutter_map/ios`) + - audio_session (from `.symlinks/plugins/audio_session/ios`) - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - Flutter (from `Flutter`) + - flutter_sound (from `.symlinks/plugins/flutter_sound/ios`) - fluwx (from `.symlinks/plugins/fluwx/ios`) - image_picker (from `.symlinks/plugins/image_picker/ios`) - jpush_flutter (from `.symlinks/plugins/jpush_flutter/ios`) + - just_audio (from `.symlinks/plugins/just_audio/ios`) - open_file (from `.symlinks/plugins/open_file/ios`) - package_info (from `.symlinks/plugins/package_info/ios`) - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`) - - path_provider (from `.symlinks/plugins/path_provider/ios`) + - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) - qr_code_scanner (from `.symlinks/plugins/qr_code_scanner/ios`) - share (from `.symlinks/plugins/share/ios`) - - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) + - sms_autofill (from `.symlinks/plugins/sms_autofill/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) - tobias (from `.symlinks/plugins/tobias/ios`) - - url_launcher (from `.symlinks/plugins/url_launcher/ios`) + - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) SPEC REPOS: trunk: - - AlipaySDK-iOS - AMap3DMap - AMapFoundation - AMapLocation + - flutter_sound_core - FMDB - JCore - JPush - MTBBarcodeScanner - - WechatOpenSDK + - WechatOpenSDK_Fuck EXTERNAL SOURCES: advance_pdf_viewer: @@ -99,69 +108,78 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/amap_flutter_location/ios" amap_flutter_map: :path: ".symlinks/plugins/amap_flutter_map/ios" + audio_session: + :path: ".symlinks/plugins/audio_session/ios" device_info_plus: :path: ".symlinks/plugins/device_info_plus/ios" Flutter: :path: Flutter + flutter_sound: + :path: ".symlinks/plugins/flutter_sound/ios" fluwx: :path: ".symlinks/plugins/fluwx/ios" image_picker: :path: ".symlinks/plugins/image_picker/ios" jpush_flutter: :path: ".symlinks/plugins/jpush_flutter/ios" + just_audio: + :path: ".symlinks/plugins/just_audio/ios" open_file: :path: ".symlinks/plugins/open_file/ios" package_info: :path: ".symlinks/plugins/package_info/ios" package_info_plus: :path: ".symlinks/plugins/package_info_plus/ios" - path_provider: - :path: ".symlinks/plugins/path_provider/ios" + path_provider_ios: + :path: ".symlinks/plugins/path_provider_ios/ios" permission_handler: :path: ".symlinks/plugins/permission_handler/ios" qr_code_scanner: :path: ".symlinks/plugins/qr_code_scanner/ios" share: :path: ".symlinks/plugins/share/ios" - shared_preferences: - :path: ".symlinks/plugins/shared_preferences/ios" + sms_autofill: + :path: ".symlinks/plugins/sms_autofill/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" tobias: :path: ".symlinks/plugins/tobias/ios" - url_launcher: - :path: ".symlinks/plugins/url_launcher/ios" + url_launcher_ios: + :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: advance_pdf_viewer: 5c832f382b4ca84fe735f893b7e91aa830c27d7b - AlipaySDK-iOS: 94ff4c0e17c5e7d126b8207596d5033006534c25 - AMap3DMap: 89b82eaad00f9246f59d2a6103eff18be5b9dd4f - amap_flutter_location: 3e33b57f1aad80b0dfb4b399de857a1a9f071e62 + AMap3DMap: 0de590972bfbe2852fe63109bc11b485d7d848fa + amap_flutter_location: 44ff5beb64f42e0bf5feb402fe299dac0013af6f amap_flutter_map: 979e54d227cedac6c7504a2151bfbf3bcf96760a - AMapFoundation: 32e9a0264ee62f5aa2aaf82bdafdda7985ce09c7 - AMapLocation: 3ec0e9bf53800b40cceb313cbd047743f75e2483 + AMapFoundation: 8d8ecbb0b2e9ce5487995360d26c885d94642bfd + AMapLocation: 5ef44a1117be7dc541cb7a7d43d03c5ee91e4387 + audio_session: 4f3e461722055d21515cf3261b64c973c062f345 device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed - Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c - fluwx: 07a55ed66bf3a4961e836a2a411b02dcada32902 + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + flutter_sound: b4eccdf53c922ad12146ac94fb2a18ceb5855c12 + flutter_sound_core: 0e902ec587e9854b4f852f4bad2d625057d9958b + fluwx: 02670633ce7509206f62b366e9734e7dda81e100 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a image_picker: 50e7c7ff960e5f58faa4d1f4af84a771c671bc4a - JCore: 9d5bda3a172c65bbe14f2806ab0f6246f8a06065 - JPush: 1fd7a326e7e6588eba517659ce1b79a144e54938 - jpush_flutter: d5fd523a73277ed66d453fc7ac1c981d1fa525e2 + JCore: 4029befb2497adc36b2496e2cfd6b24d9f671784 + JPush: b7d00f2cc78766e76c8abb30a5741fe94d21e5bc + jpush_flutter: bc88cfa9a4ff4481031564b641c3fe24024bb2cb + just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb open_file: 02eb5cb6b21264bd3a696876f5afbfb7ca4f4b7d package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e - path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c + path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e share: 0b2c3e82132f5888bccca3351c504d0003b3b410 - shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d + sms_autofill: c461043483362c3f1709ee76eaae6eb570b31686 sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 - tobias: 6872e2198dc30e17c10513b9ee114e28d099bc70 - url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef - WechatOpenSDK: 6a4d1436c15b3b5fe2a0bd383f3046010186da44 + tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5 + url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de + WechatOpenSDK_Fuck: aa8f4b0af902837e887a1d40c62f06c060c1dc98 PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea -COCOAPODS: 1.11.0 +COCOAPODS: 1.11.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 59948331..06f64d98 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -382,7 +382,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = 89Z9B4EZ45; + DEVELOPMENT_TEAM = R45ZDS6S92; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -526,7 +526,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = 89Z9B4EZ45; + DEVELOPMENT_TEAM = R45ZDS6S92; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -564,7 +564,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 8; - DEVELOPMENT_TEAM = 89Z9B4EZ45; + DEVELOPMENT_TEAM = R45ZDS6S92; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift index 7383eba1..c7ac4f99 100644 --- a/ios/Runner/AppDelegate.swift +++ b/ios/Runner/AppDelegate.swift @@ -7,10 +7,10 @@ import Flutter _ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? ) -> Bool { - // if #available(iOS 10.0, *) { - // UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate - // } - AMapServices.shared().apiKey ="84041703f7ecb242685325796897eff4" +// if #available(iOS 10.0, *) { +// UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate +// } + AMapServices.shared().apiKey = "84041703f7ecb242685325796897eff4" GeneratedPluginRegistrant.register(with: self) return super.application(application, didFinishLaunchingWithOptions: launchOptions) } diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h index 308a2a56..7b0f9058 100644 --- a/ios/Runner/Runner-Bridging-Header.h +++ b/ios/Runner/Runner-Bridging-Header.h @@ -1 +1,3 @@ #import "GeneratedPluginRegistrant.h" +#import +#import diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 718db230..5a270d4f 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -20,7 +20,7 @@ import 'package:aku_new_community/ui/home/public_infomation/public_information_d import 'package:aku_new_community/ui/market/search/good_detail_page.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/login_util.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/others/rectIndicator.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; diff --git a/lib/pages/message_center_page/announce/announce_card.dart b/lib/pages/message_center_page/announce/announce_card.dart index 21303cd2..1691c42c 100644 --- a/lib/pages/message_center_page/announce/announce_card.dart +++ b/lib/pages/message_center_page/announce/announce_card.dart @@ -3,7 +3,7 @@ import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/models/home/home_announce_model.dart'; import 'package:aku_new_community/pages/message_center_page/announce/announce_view.dart'; import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/message_center_page/reply/reply_card.dart b/lib/pages/message_center_page/reply/reply_card.dart index f9cd58b5..416a3154 100644 --- a/lib/pages/message_center_page/reply/reply_card.dart +++ b/lib/pages/message_center_page/reply/reply_card.dart @@ -2,7 +2,7 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/models/message/reply_list_model.dart'; import 'package:aku_new_community/pages/message_center_page/message_func.dart'; import 'package:aku_new_community/ui/community/community_views/event_detail_page.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; diff --git a/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart b/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart index 34aeda45..9b70dd6d 100644 --- a/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart +++ b/lib/pages/message_center_page/thumbs_up/thumbs_up_card.dart @@ -3,7 +3,7 @@ import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/models/message/reply_list_model.dart'; import 'package:aku_new_community/models/message/thumbs_up_list_model.dart'; import 'package:aku_new_community/pages/message_center_page/message_func.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; diff --git a/lib/pages/opening_code_page/opening_code_page.dart b/lib/pages/opening_code_page/opening_code_page.dart index 7837c110..4cb714b5 100644 --- a/lib/pages/opening_code_page/opening_code_page.dart +++ b/lib/pages/opening_code_page/opening_code_page.dart @@ -5,7 +5,7 @@ import 'package:aku_new_community/ui/profile/new_house/certification/certificati import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; diff --git a/lib/pages/personal/user_profile_page.dart b/lib/pages/personal/user_profile_page.dart index d79839a7..e6104e74 100644 --- a/lib/pages/personal/user_profile_page.dart +++ b/lib/pages/personal/user_profile_page.dart @@ -8,7 +8,7 @@ import 'package:aku_new_community/provider/user_provider.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; import 'package:aku_new_community/widget/picker/bee_custom_picker.dart'; diff --git a/lib/pages/personal/wallet/balance_record_view.dart b/lib/pages/personal/wallet/balance_record_view.dart index 0a3a4fe4..a637a247 100644 --- a/lib/pages/personal/wallet/balance_record_view.dart +++ b/lib/pages/personal/wallet/balance_record_view.dart @@ -35,6 +35,7 @@ class _BalanceRecordViewState extends State { 4: '收入', 5: '提现', 6: '抵扣', + 7: '购买' }; @override @@ -79,6 +80,7 @@ class _BalanceRecordViewState extends State { MaterialButton( color: Colors.black.withOpacity(0.06), onPressed: () async { + _pickType = _types.keys.toList()[0]; await showModalBottomSheet( context: context, builder: (context) { @@ -139,8 +141,9 @@ class _BalanceRecordViewState extends State { 'pageNum': _pageNum, 'size': _size, 'modelType': 0, - 'type': _pickType, - 'createDate': _pickTime, + 'type': _pickType == 0 ? null : _pickType, + 'createDate': + DateUtil.formatDate(_pickTime, format: DateFormats.full), }); _models = baseList.rows @@ -156,8 +159,9 @@ class _BalanceRecordViewState extends State { 'pageNum': _pageNum, 'size': _size, 'modelType': 0, - 'type': _pickType, - 'createDate': _pickTime, + 'type': _pickType == 0 ? null : _pickType, + 'createDate': + DateUtil.formatDate(_pickTime, format: DateFormats.full), }); if (baseList.total > _models.length) { _models.addAll(baseList.rows diff --git a/lib/pages/personal/wallet/pay_way_dialog.dart b/lib/pages/personal/wallet/pay_way_dialog.dart index 1eb75380..5e439864 100644 --- a/lib/pages/personal/wallet/pay_way_dialog.dart +++ b/lib/pages/personal/wallet/pay_way_dialog.dart @@ -61,46 +61,37 @@ class _PayWayDialogState extends State { _payType.add(0); setState(() {}); }, - child: ClipRect( - child: Stack( - children: [ - Material( - color: Colors.transparent, - child: Row( - children: [ - Assets.newIcon.walletBalance.image(width: 48.w, height: 48.w), - 8.wb, - '钱包余额' - .text - .size(28.sp) - .color(Colors.black.withOpacity(0.85)) - .make(), - 16.wb, - Visibility( - visible: widget.insufficientBalance, - child: - '钱包余额不足'.text.size(24.sp).color(Colors.red).make()), - Spacer(), - BeeCheckRadio( - groupValue: _payType, - value: 0, - size: 36.w, - indent: Icon( - CupertinoIcons.checkmark_alt, - color: Colors.black, - size: 28.w, - ), - ), - ], + child: Opacity( + opacity: widget.insufficientBalance?0.4:1, + child: Material( + color: Colors.transparent, + child: Row( + children: [ + Assets.newIcon.walletBalance.image(width: 48.w, height: 48.w), + 8.wb, + '钱包余额' + .text + .size(28.sp) + .color(Colors.black.withOpacity(0.85)) + .make(), + 16.wb, + Visibility( + visible: widget.insufficientBalance, + child: + '钱包余额不足'.text.size(24.sp).color(Colors.red).make()), + Spacer(), + BeeCheckRadio( + groupValue: _payType, + value: 0, + size: 36.w, + indent: Icon( + CupertinoIcons.checkmark_alt, + color: Colors.black, + size: 28.w, + ), ), - ), - BackdropFilter( - filter: ImageFilter.blur( - sigmaX: widget.insufficientBalance ? 1 : 0, - sigmaY: widget.insufficientBalance ? 1 : 0), - child: Container(), - ), - ], + ], + ), ), ), ); diff --git a/lib/pages/personal/wallet/point_record_view.dart b/lib/pages/personal/wallet/point_record_view.dart index d3e8bf54..f6a2d74b 100644 --- a/lib/pages/personal/wallet/point_record_view.dart +++ b/lib/pages/personal/wallet/point_record_view.dart @@ -35,6 +35,7 @@ class _PointRecordViewState extends State { 4: '收入', 5: '提现', 6: '抵扣', + 7: '购买' }; @override @@ -79,6 +80,7 @@ class _PointRecordViewState extends State { MaterialButton( color: Colors.black.withOpacity(0.06), onPressed: () async { + _pickType = _types.keys.toList()[0]; await showModalBottomSheet( context: context, builder: (context) { @@ -139,8 +141,9 @@ class _PointRecordViewState extends State { 'pageNum': _pageNum, 'size': _size, 'modelType': 1, - 'type': _pickType, - 'createDate': _pickTime, + 'type': _pickType == 0 ? null : _pickType, + 'createDate': + DateUtil.formatDate(_pickTime, format: DateFormats.full), }); _models = baseList.rows @@ -155,8 +158,9 @@ class _PointRecordViewState extends State { 'pageNum': _pageNum, 'size': _size, 'modelType': 0, - 'type': _pickType, - 'createDate': _pickTime, + 'type': _pickType == 0 ? null : _pickType, + 'createDate': + DateUtil.formatDate(_pickTime, format: DateFormats.full), }); if (baseList.total > _models.length) { _models.addAll(baseList.rows diff --git a/lib/pages/personal/wallet/wallet_recharge_page.dart b/lib/pages/personal/wallet/wallet_recharge_page.dart index a0ceadec..3b6c4455 100644 --- a/lib/pages/personal/wallet/wallet_recharge_page.dart +++ b/lib/pages/personal/wallet/wallet_recharge_page.dart @@ -2,6 +2,7 @@ import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/pages/personal/wallet/pay_way_dialog.dart'; +import 'package:aku_new_community/pages/personal/wallet/wallet_trade_record_page.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; import 'package:aku_new_community/widget/others/user_tool.dart'; @@ -41,7 +42,7 @@ class _WalletRechargePageState extends State _tabController = TabController(length: 2, vsync: this, initialIndex: widget.initIndex); _currentIndex = widget.initIndex; - _rechargeValue = widget.initIndex == 0 ? _balanceValue[0] : _pointValue[0]; + _rechargeValue = widget.initIndex == 0 ? _balanceValue[0] : (_pointValue[0]~/10); super.initState(); } @@ -51,8 +52,10 @@ class _WalletRechargePageState extends State title: '钱包充值', actions: [ TextButton( - onPressed: () {}, - child: '账单' + onPressed: () { + Get.to(()=>WalletTradeRecordPage()); + }, + child: '交易记录' .text .size(28.sp) .color(Colors.black.withOpacity(0.85)) diff --git a/lib/ui/community/activity/activity_card.dart b/lib/ui/community/activity/activity_card.dart index 1ae6b365..017317d2 100644 --- a/lib/ui/community/activity/activity_card.dart +++ b/lib/ui/community/activity/activity_card.dart @@ -2,7 +2,7 @@ import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/models/home/home_activity_model.dart'; import 'package:aku_new_community/ui/community/activity/activity_func.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/ui/community/activity/activity_detail_page.dart b/lib/ui/community/activity/activity_detail_page.dart index b077444c..b1f116ce 100644 --- a/lib/ui/community/activity/activity_detail_page.dart +++ b/lib/ui/community/activity/activity_detail_page.dart @@ -6,7 +6,7 @@ import 'package:aku_new_community/models/home/home_activity_model.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/buttons/bottom_button.dart'; diff --git a/lib/ui/community/community_views/topic/topic_community_view.dart b/lib/ui/community/community_views/topic/topic_community_view.dart index 317695bf..fd203d57 100644 --- a/lib/ui/community/community_views/topic/topic_community_view.dart +++ b/lib/ui/community/community_views/topic/topic_community_view.dart @@ -6,7 +6,7 @@ import 'package:aku_new_community/models/community/topic_list_model.dart'; import 'package:aku_new_community/pages/things_page/widget/bee_list_view.dart'; import 'package:aku_new_community/ui/community/community_views/topic/topic_detail_page.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:flutter/material.dart'; import 'package:flutter_easyrefresh/easy_refresh.dart'; diff --git a/lib/ui/community/notice/notice_card.dart b/lib/ui/community/notice/notice_card.dart index 691329d8..711f5506 100644 --- a/lib/ui/community/notice/notice_card.dart +++ b/lib/ui/community/notice/notice_card.dart @@ -2,7 +2,7 @@ import 'package:aku_new_community/model/common/img_model.dart'; import 'package:aku_new_community/models/home/home_announce_model.dart'; import 'package:aku_new_community/ui/community/notice/notice_detail_page.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; diff --git a/lib/ui/community/notice/notice_detail_page.dart b/lib/ui/community/notice/notice_detail_page.dart index a9f73558..98073cb1 100644 --- a/lib/ui/community/notice/notice_detail_page.dart +++ b/lib/ui/community/notice/notice_detail_page.dart @@ -3,7 +3,7 @@ import 'package:aku_new_community/models/home/announce_detail_model.dart'; import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:aku_new_community/widget/views/bee_download_view.dart'; diff --git a/lib/ui/function_and_service/task/hall/hall_card.dart b/lib/ui/function_and_service/task/hall/hall_card.dart index a0773b69..e5ddfb75 100644 --- a/lib/ui/function_and_service/task/hall/hall_card.dart +++ b/lib/ui/function_and_service/task/hall/hall_card.dart @@ -59,7 +59,9 @@ class HallCard extends StatelessWidget { ), ), Spacer(), - Assets.icons.intergral.image(width: 24.w, height: 24.w), + model.rewardType == 2 + ? Assets.icons.intergral.image(width: 24.w, height: 24.w) + : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(), 8.w.widthBox, '${model.reward}'.text.size(32.sp).color(Colors.red).make() ], diff --git a/lib/ui/function_and_service/task/publish_task_page.dart b/lib/ui/function_and_service/task/publish_task_page.dart index fee02160..46ac2ce4 100644 --- a/lib/ui/function_and_service/task/publish_task_page.dart +++ b/lib/ui/function_and_service/task/publish_task_page.dart @@ -128,9 +128,11 @@ class _PublishTaskPageState extends State { if (balance > (UserTool.userProvider.userInfoModel!.balance ?? 0)) { BotToast.showText(text: '余额不足，请前往充值'); + return; } else { if (!UserTool.userProvider.userInfoModel!.isBalancePayPwd) { Get.dialog(SetPayPasswordDialog()); + return; } else { psdCode = await Get.dialog(InputPayPasswordDialog()); } diff --git a/lib/ui/function_and_service/work_order/publish_work_order_page.dart b/lib/ui/function_and_service/work_order/publish_work_order_page.dart index c37fc796..9ed313b6 100644 --- a/lib/ui/function_and_service/work_order/publish_work_order_page.dart +++ b/lib/ui/function_and_service/work_order/publish_work_order_page.dart @@ -8,7 +8,7 @@ import 'package:aku_new_community/ui/function_and_service/work_order/work_order_ import 'package:aku_new_community/ui/function_and_service/work_order/work_order_remark_page.dart'; import 'package:aku_new_community/ui/profile/new_house/my_house_page.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/bee_divider.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:aku_new_community/widget/buttons/bee_long_button.dart'; diff --git a/lib/ui/home/public_infomation/public_infomation_card.dart b/lib/ui/home/public_infomation/public_infomation_card.dart index eb8e367b..c5d4be98 100644 --- a/lib/ui/home/public_infomation/public_infomation_card.dart +++ b/lib/ui/home/public_infomation/public_infomation_card.dart @@ -2,7 +2,7 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/models/community/information_list_model.dart'; import 'package:aku_new_community/ui/home/public_infomation/public_information_detail_page.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:common_utils/common_utils.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/ui/home/public_infomation/public_information_detail_page.dart b/lib/ui/home/public_infomation/public_information_detail_page.dart index adf8084b..1e08e8ce 100644 --- a/lib/ui/home/public_infomation/public_information_detail_page.dart +++ b/lib/ui/home/public_infomation/public_information_detail_page.dart @@ -6,7 +6,7 @@ import 'package:aku_new_community/utils/bee_date_util.dart'; import 'package:aku_new_community/utils/link_text_parase.dart'; import 'package:aku_new_community/utils/network/base_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/bee_scaffold.dart'; import 'package:bot_toast/bot_toast.dart'; import 'package:common_utils/common_utils.dart'; diff --git a/lib/ui/market/category/new_category_sub_card.dart b/lib/ui/market/category/new_category_sub_card.dart index 15aecbae..42ea5e46 100644 --- a/lib/ui/market/category/new_category_sub_card.dart +++ b/lib/ui/market/category/new_category_sub_card.dart @@ -1,7 +1,7 @@ import 'package:aku_new_community/models/market/market_all_category_model.dart'; import 'package:aku_new_community/ui/market/search/search_goods_page.dart'; import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; diff --git a/lib/ui/market/market_page.dart b/lib/ui/market/market_page.dart index 711a5933..b9c2a0da 100644 --- a/lib/ui/market/market_page.dart +++ b/lib/ui/market/market_page.dart @@ -22,7 +22,7 @@ import 'package:aku_new_community/ui/market/widget/animated_home_background.dart import 'package:aku_new_community/utils/headers.dart'; import 'package:aku_new_community/utils/network/base_list_model.dart'; import 'package:aku_new_community/utils/network/net_util.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/home/home_sliver_app_bar.dart'; import 'package:aku_new_community/widget/others/rectIndicator.dart'; import 'package:card_swiper/card_swiper.dart'; diff --git a/lib/ui/market/order/order_card.dart b/lib/ui/market/order/order_card.dart index 7b760dad..68d8ca5e 100644 --- a/lib/ui/market/order/order_card.dart +++ b/lib/ui/market/order/order_card.dart @@ -1,5 +1,6 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/constants/saas_api.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/model/order/order_list_model.dart'; import 'package:aku_new_community/pages/life_pay/pay_finish_page.dart'; import 'package:aku_new_community/pages/life_pay/pay_util.dart'; @@ -668,8 +669,15 @@ class _OrderCardState extends State { Row( children: [ Spacer(), - '商品金额：'.text.size(28.sp).color(Color(0xFF666666)).make(), - '¥${((widget.model.payPrice ?? 0) - (widget.model.freightFee ?? 0)).toStringAsFixed(2)}' + '${widget.model.payType == 10 ? '商品积分' : '商品金额'}：' + .text + .size(28.sp) + .color(Color(0xFF666666)) + .make(), + widget.model.payType == 10 + ? Assets.icons.intergral.image(width: 24.w, height: 24.w) + : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(), + ' ${((widget.model.payPrice ?? 0) - (widget.model.freightFee ?? 0)).toStringAsFixed(widget.model.payType == 10 ? 0 : 2)}' .text .size(28.sp) .color(Color(0xFF666666)) @@ -680,7 +688,7 @@ class _OrderCardState extends State { children: [ Spacer(), '运费：'.text.size(28.sp).color(Color(0xFF666666)).make(), - '¥${((widget.model.freightFee ?? 0)).toStringAsFixed(2)}' + '¥ ${((widget.model.freightFee ?? 0)).toStringAsFixed(2)}' .text .size(28.sp) .color(Color(0xFF666666)) @@ -690,8 +698,15 @@ class _OrderCardState extends State { Row( children: [ Spacer(), - '实付款：'.text.size(32.sp).color(Color(0xFF333333)).make(), - '¥${((widget.model.payPrice ?? 0)).toStringAsFixed(2)}' + '${widget.model.payType == 10 ? '实付积分' : '实付款'}: ' + .text + .size(32.sp) + .color(Color(0xFF333333)) + .make(), + widget.model.payType == 10 + ? Assets.icons.intergral.image(width: 24.w, height: 24.w) + : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(), + ' ${((widget.model.payPrice ?? 0)).toStringAsFixed(widget.model.payType == 10 ? 0 : 2)}' .text .size(28.sp) .color(Color(0xFFE52E2E)) diff --git a/lib/ui/market/order/order_detail_page.dart b/lib/ui/market/order/order_detail_page.dart index da97fc18..2fb8fe44 100644 --- a/lib/ui/market/order/order_detail_page.dart +++ b/lib/ui/market/order/order_detail_page.dart @@ -4,6 +4,7 @@ import 'package:aku_new_community/base/base_style.dart'; import 'package:aku_new_community/const/resource.dart'; import 'package:aku_new_community/constants/api.dart'; import 'package:aku_new_community/constants/saas_api.dart'; +import 'package:aku_new_community/gen/assets.gen.dart'; import 'package:aku_new_community/model/order/logistics_model.dart'; import 'package:aku_new_community/model/order/order_list_model.dart'; import 'package:aku_new_community/pages/life_pay/pay_util.dart'; @@ -308,8 +309,11 @@ class _OrderDetailPageState extends State { Row( children: [ Spacer(), - '商品金额：'.text.size(28.sp).color(Color(0xFF666666)).make(), - '¥${((widget.orderModel.payPrice ?? 0) - (widget.orderModel.freightFee ?? 0)).toStringAsFixed(2)}' + '${widget.orderModel.payType==10?'商品积分':'商品金额'}：'.text.size(28.sp).color(Color(0xFF666666)).make(), + widget.orderModel.payType == 10 + ? Assets.icons.intergral.image(width: 24.w, height: 24.w) + : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(), + ' ${((widget.orderModel.payPrice ?? 0) - (widget.orderModel.freightFee ?? 0)).toStringAsFixed(widget.orderModel.payType==10?0: 2)}' .text .size(28.sp) .color(Color(0xFF333333)) @@ -321,7 +325,7 @@ class _OrderDetailPageState extends State { children: [ Spacer(), '运费：'.text.size(28.sp).color(Color(0xFF666666)).make(), - '¥${((widget.orderModel.freightFee ?? 0)).toStringAsFixed(2)}' + '¥ ${((widget.orderModel.freightFee ?? 0)).toStringAsFixed(2)}' .text .size(28.sp) .color(Color(0xFF666666)) @@ -332,8 +336,11 @@ class _OrderDetailPageState extends State { Row( children: [ Spacer(), - '实付款：'.text.size(32.sp).color(Color(0xFF333333)).bold.make(), - '¥${((widget.orderModel.payPrice ?? 0)).toStringAsFixed(2)}' + '${widget.orderModel.payType==10?'实付积分':'实付款'}：'.text.size(32.sp).color(Color(0xFF333333)).bold.make(), + widget.orderModel.payType == 10 + ? Assets.icons.intergral.image(width: 24.w, height: 24.w) + : '¥'.text.size(28.sp).color(Color(0xFF666666)).make(), + ' ${((widget.orderModel.payPrice ?? 0)).toStringAsFixed(widget.orderModel.payType==10?0: 2)}' .text .size(28.sp) .color(Color(0xFFE52E2E)) diff --git a/lib/ui/market/search/submit_order_page_normal.dart b/lib/ui/market/search/submit_order_page_normal.dart index 570a5da7..ab88a100 100644 --- a/lib/ui/market/search/submit_order_page_normal.dart +++ b/lib/ui/market/search/submit_order_page_normal.dart @@ -61,7 +61,7 @@ class _SubmitOrderNormalPageState extends State { if (appProvider.defaultAddressModel != null) { _addressModel = appProvider.defaultAddressModel!; - createOrder(_addressModel!.id!, _goodsList); + // createOrder(_addressModel!.id!, _goodsList); } else { _addressModel = null; } @@ -159,7 +159,7 @@ class _SubmitOrderNormalPageState extends State { _goodsList.map((v) => v.toJson()).toList(), "payType": 10, //暂时写死 等待后续补充 'points': widget.integral, - }); + },showMessage: true); if (baseModel.success) { Get.off(() => OrderPage(initIndex: 2)); } @@ -234,7 +234,7 @@ class _SubmitOrderNormalPageState extends State { '当前积分'.text.size(28.sp).color(Color(0xFF4F4F4F)).make(), Spacer(), // (UserTool.userProvider.userInfoModel!.points ?? 0) - (0).text.size(28.sp).color(Colors.red).make(), + (widget.integral??0).text.size(28.sp).color(Colors.red).make(), ], ), ); @@ -258,7 +258,7 @@ class _SubmitOrderNormalPageState extends State { )); if (result != null) { _addressModel = result; - createOrder(_addressModel!.id!, _goodsList); + // createOrder(_addressModel!.id!, _goodsList); } else { _addressModel = null; } @@ -690,7 +690,7 @@ class _SubmitOrderNormalPageState extends State { if (num > 1) { _controllers.text = (num - 1).toString(); _goodsList[0].num = num - 1; - createOrder(_addressModel!.id!, _goodsList); + // createOrder(_addressModel!.id!, _goodsList); } setState(() {}); @@ -736,7 +736,7 @@ class _SubmitOrderNormalPageState extends State { _controllers.text = (int.parse(_controllers.text) + 1).toString(); _goodsList[0].num = num + 1; - createOrder(_addressModel!.id!, _goodsList); + // createOrder(_addressModel!.id!, _goodsList); setState(() {}); } diff --git a/lib/utils/network/net_util.dart b/lib/utils/network/net_util.dart index 69ecba6f..10bdc07c 100644 --- a/lib/utils/network/net_util.dart +++ b/lib/utils/network/net_util.dart @@ -215,7 +215,7 @@ class NetUtil { //暂时隐去一键登录页 Get.offAll(() => OtherLoginPage()); } - if (model.code==10100) { + if (model.msg=='该用户未实名认证') { BotToast.showText(text: '请先实名认证'); Get.dialog(CertificationDialog()); } diff --git a/lib/widget/beeImageNetwork.dart b/lib/widget/bee_image_network.dart similarity index 100% rename from lib/widget/beeImageNetwork.dart rename to lib/widget/bee_image_network.dart diff --git a/lib/widget/others/stack_avatar.dart b/lib/widget/others/stack_avatar.dart index 9de23df5..9058c68b 100644 --- a/lib/widget/others/stack_avatar.dart +++ b/lib/widget/others/stack_avatar.dart @@ -1,5 +1,5 @@ import 'package:aku_new_community/utils/headers.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:flutter/material.dart'; class StackAvatar extends StatelessWidget { diff --git a/lib/widget/views/bee_hor_image_view.dart b/lib/widget/views/bee_hor_image_view.dart index b1f77a07..b9162a50 100644 --- a/lib/widget/views/bee_hor_image_view.dart +++ b/lib/widget/views/bee_hor_image_view.dart @@ -1,7 +1,7 @@ import 'package:aku_new_community/extensions/num_ext.dart'; import 'package:aku_new_community/extensions/widget_list_ext.dart'; import 'package:aku_new_community/model/common/img_model.dart'; -import 'package:aku_new_community/widget/beeImageNetwork.dart'; +import 'package:aku_new_community/widget/bee_image_network.dart'; import 'package:aku_new_community/widget/picker/bee_image_preview.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/pubspec.lock b/pubspec.lock index d4e08ca8..f8605156 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -760,6 +760,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" meta: dependency: transitive description: @@ -1207,7 +1214,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "0.4.8" time: dependency: transitive description: