diff --git a/ios/Gemfile b/ios/Gemfile new file mode 100644 index 00000000..1afd2cce --- /dev/null +++ b/ios/Gemfile @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } + +# gem "rails" diff --git a/ios/Podfile.lock b/ios/Podfile.lock index dece6996..83cd83e2 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -14,155 +14,157 @@ PODS: - AFNetworking/Serialization (4.0.1) - AFNetworking/UIKit (4.0.1): - AFNetworking/NSURLSession - - BaiduMapKit/Base (6.2.0) - - BaiduMapKit/Map (6.2.0): + - BaiduMapKit/Base (6.5.1) + - BaiduMapKit/Map (6.5.1): - BaiduMapKit/Base - - BaiduMapKit/Search (6.2.0): + - BaiduMapKit/Search (6.5.1): - BaiduMapKit/Base - - BaiduMapKit/Utils (6.2.0): + - BaiduMapKit/Utils (6.5.1): - BaiduMapKit/Base - - BMKLocationKit (2.0.0) + - BMKLocationKit (2.0.4) - Flutter (1.0.0) - - flutter_baidu_mapapi_base (2.0.0): - - BaiduMapKit/Utils (= 6.2.0) + - flutter_baidu_mapapi_base (3.1.0): + - BaiduMapKit/Utils (= 6.5.1) - Flutter - - flutter_baidu_mapapi_map (2.0.0): - - BaiduMapKit/Map (= 6.2.0) + - flutter_baidu_mapapi_map (3.1.0): + - BaiduMapKit/Map (= 6.5.1) - Flutter - flutter_baidu_mapapi_base - - flutter_baidu_mapapi_search (0.0.1): - - BaiduMapKit/Search (= 6.2.0) + - flutter_baidu_mapapi_search (3.1.0): + - BaiduMapKit/Search (= 6.5.1) - Flutter - flutter_baidu_mapapi_base - - flutter_baidu_mapapi_utils (2.0.0): - - BaiduMapKit/Utils (= 6.2.0) + - flutter_baidu_mapapi_utils (3.1.0): + - BaiduMapKit/Utils (= 6.5.1) - Flutter - flutter_baidu_mapapi_base - - flutter_bmflocation (1.0.3): - - BMKLocationKit + - flutter_bmflocation (2.0.1): + - BMKLocationKit (~> 2.0.4) - Flutter - fluwx (0.0.1): - Flutter - - "OpenWeChatSDK (~> 1.9.2+1)" + - OpenWeChatSDK (~> 1.9.6) - image_pickers (0.0.1): - AFNetworking - Flutter - ZLPhotoBrowser-objc (= 1.0.4) - - mob_sharesdk (4.4.0): - - mob_sharesdk/ShareSDK (= 4.4.0) + - mob_sharesdk (4.4.8): + - mob_sharesdk/ShareSDK (= 4.4.8) - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDK (4.4.0): + - mob_sharesdk/ShareSDK (4.4.8): - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKExtension (4.4.0): + - mob_sharesdk/ShareSDKExtension (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/DingTalk (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/DingTalk (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Douyin (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Douyin (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Dropbox (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Dropbox (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Evernote (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Evernote (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Facebook (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Facebook (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Flickr (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Flickr (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/GooglePlus (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/GooglePlus (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Instagram (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Instagram (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Instapaper (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Instapaper (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Kakao (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Kakao (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/KuaiShou (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/KuaiShou (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Line (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Line (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/LinkedIn (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/LinkedIn (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Messenger (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Messenger (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/MingDao (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/MingDao (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Oasis (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Oasis (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Pinterest (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Pinterest (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Pocket (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Pocket (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Reddit (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Reddit (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/SinaWeibo (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/SinaWeibo (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/SMS (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/SMS (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/SnapChat (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/SnapChat (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Telegram (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Telegram (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/TikTok (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/TikTok (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Twitter (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Twitter (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/VKontakte (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/VKontakte (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/Yixin (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/Yixin (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/YouDaoNote (4.4.0): + - mob_sharesdk/ShareSDKPlatforms/YouDaoNote (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKRestoreScene (4.4.0): + - mob_sharesdk/ShareSDKRestoreScene (4.4.8): - mob_sharesdk/ShareSDKExtension - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKUI (4.4.0): + - mob_sharesdk/ShareSDKUI (4.4.8): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - MOBFoundation (3.2.26) - - "OpenWeChatSDK (1.9.2+1)" + - MOBFoundation (3.2.37) + - number_precision (0.0.1): + - Flutter + - OpenWeChatSDK (1.9.6) - package_info (0.0.1): - Flutter - path_provider (0.0.1): @@ -171,12 +173,12 @@ PODS: - Flutter - scan (0.0.1): - Flutter - - SDWebImage (5.12.1): - - SDWebImage/Core (= 5.12.1) - - SDWebImage/Core (5.12.1) - - shared_preferences (0.0.1): + - SDWebImage (5.13.4): + - SDWebImage/Core (= 5.13.4) + - SDWebImage/Core (5.13.4) + - shared_preferences_ios (0.0.1): - Flutter - - sharesdk_plugin (1.1.2): + - sharesdk_plugin (1.1.3): - Flutter - mob_sharesdk - mob_sharesdk/ShareSDKExtension @@ -215,7 +217,7 @@ PODS: - mob_sharesdk/ShareSDKPlatforms/YouDaoNote - mob_sharesdk/ShareSDKRestoreScene - mob_sharesdk/ShareSDKUI - - SSZipArchive (2.4.2) + - SSZipArchive (2.4.3) - thumbnails (0.0.1): - Flutter - tobias (0.0.1): @@ -226,7 +228,7 @@ PODS: - TPNS-iOS (= 1.3.4.1) - url_launcher (0.0.1): - Flutter - - video_player (0.0.1): + - video_player_avfoundation (0.0.1): - Flutter - wakelock (0.0.1): - Flutter @@ -244,18 +246,19 @@ DEPENDENCIES: - flutter_bmflocation (from `.symlinks/plugins/flutter_bmflocation/ios`) - fluwx (from `.symlinks/plugins/fluwx/ios`) - image_pickers (from `.symlinks/plugins/image_pickers/ios`) + - number_precision (from `.symlinks/plugins/number_precision/ios`) - package_info (from `.symlinks/plugins/package_info/ios`) - path_provider (from `.symlinks/plugins/path_provider/ios`) - permission_handler (from `.symlinks/plugins/permission_handler/ios`) - scan (from `.symlinks/plugins/scan/ios`) - - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) + - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`) - sharesdk_plugin (from `.symlinks/plugins/sharesdk_plugin/ios`) - SSZipArchive (~> 2.4.2) - thumbnails (from `.symlinks/plugins/thumbnails/ios`) - tobias (from `.symlinks/plugins/tobias/ios`) - tpns_flutter_plugin (from `.symlinks/plugins/tpns_flutter_plugin/ios`) - url_launcher (from `.symlinks/plugins/url_launcher/ios`) - - video_player (from `.symlinks/plugins/video_player/ios`) + - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`) - wakelock (from `.symlinks/plugins/wakelock/ios`) - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`) @@ -289,6 +292,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/fluwx/ios" image_pickers: :path: ".symlinks/plugins/image_pickers/ios" + number_precision: + :path: ".symlinks/plugins/number_precision/ios" package_info: :path: ".symlinks/plugins/package_info/ios" path_provider: @@ -297,8 +302,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/permission_handler/ios" scan: :path: ".symlinks/plugins/scan/ios" - shared_preferences: - :path: ".symlinks/plugins/shared_preferences/ios" + shared_preferences_ios: + :path: ".symlinks/plugins/shared_preferences_ios/ios" sharesdk_plugin: :path: ".symlinks/plugins/sharesdk_plugin/ios" thumbnails: @@ -309,8 +314,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/tpns_flutter_plugin/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" - video_player: - :path: ".symlinks/plugins/video_player/ios" + video_player_avfoundation: + :path: ".symlinks/plugins/video_player_avfoundation/ios" wakelock: :path: ".symlinks/plugins/wakelock/ios" webview_flutter: @@ -318,37 +323,38 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce - BaiduMapKit: 907c6d9b74f66c3ff4741fc4b568ae0b339917f8 - BMKLocationKit: 097814ef672b1e57e86e6c1968d7892fb78002bf + BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777 + BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780 Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a - flutter_baidu_mapapi_base: 90fddba11ec4435406a7211d6ee905b4311c31db - flutter_baidu_mapapi_map: 771bf00671832b1fcddb17733518cd631529df16 - flutter_baidu_mapapi_search: 4cffaa74e739a4114595c4f82f790e1783bb612d - flutter_baidu_mapapi_utils: a5bd582b91ecd35be1bc45558b38f49d5684f70a - flutter_bmflocation: 12f1ba91bae4b16d78d4f475023e0254ed351f1c - fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492 + flutter_baidu_mapapi_base: cb406be78c3a949fb58a45dc6627f139d580bd37 + flutter_baidu_mapapi_map: 81c4e6e93dc668e311d9b521421deaf292390434 + flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08 + flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1 + flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf + fluwx: 1649fdbdb0a7e24f3a371ca0f302e25dc1c022ab image_pickers: 5e6ec7083f9363d014c0fb061f1b9cd97bb5e451 - mob_sharesdk: c771f001e00739d24301a9fa250247601efe7a3c - MOBFoundation: 2abd23c80c33d1337d30dc4b0018ed914cef8f8e - OpenWeChatSDK: 67375e7d4154c22f7ba6b1c334b121473e7d515c + mob_sharesdk: b707987dfbe7e180ea60ddf4b5db30126ac98390 + MOBFoundation: 2fcfc8b48bf311ace31e99c941b70f573c88880a + number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8 + OpenWeChatSDK: 8fb6c3c7ce9a57f37d001060282de1f138d09940 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86 - SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b - shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d - sharesdk_plugin: dbe766efb15fdb2605133084da7a9144a1410d71 - SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2 + SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3 + shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad + sharesdk_plugin: ad2cacfb74c4b82fbc4100cc882d05507f908aed + SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5 TPNS-iOS: 36c335eff80670de6ede780ab827f679d78f64ff tpns_flutter_plugin: ed7fae92efde473d5cb9fd33ac92caa2d64530a2 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef - video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e + video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f - webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b + webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232 ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736 PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c -COCOAPODS: 1.11.2 +COCOAPODS: 1.11.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index f7a2b2b1..a4707072 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -617,7 +617,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -667,7 +667,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.4; + MARKETING_VERSION = 3.1.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -819,7 +819,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -869,7 +869,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.4; + MARKETING_VERSION = 3.1.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -912,7 +912,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +962,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 3.1.4; + MARKETING_VERSION = 3.1.5; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/community/headlines/article_list.dart b/lib/community/headlines/article_list.dart index 60381c7c..dac1dec3 100644 --- a/lib/community/headlines/article_list.dart +++ b/lib/community/headlines/article_list.dart @@ -162,7 +162,6 @@ class _ArticleList extends State { color: Color(0xFF8D8D8D), ), )), - Spacer() ], ) diff --git a/lib/community/headlines/headlines_column_details.dart b/lib/community/headlines/headlines_column_details.dart index b043c61d..215a38aa 100644 --- a/lib/community/headlines/headlines_column_details.dart +++ b/lib/community/headlines/headlines_column_details.dart @@ -432,7 +432,7 @@ class _HeadlinesColumnDetails extends State // ), // ), // ), - SizedBox(width: 8), + // SizedBox(width: 8), Image.asset( "assets/image/browse.webp", width: 14, diff --git a/lib/order/order_view/order_pay_selected.dart b/lib/order/order_view/order_pay_selected.dart index 860a7105..2da5ef31 100644 --- a/lib/order/order_view/order_pay_selected.dart +++ b/lib/order/order_view/order_pay_selected.dart @@ -19,7 +19,7 @@ class _OrderPaySelected extends State { builder: (BuildContext context, StateSetter setState) { return Container( width: double.infinity, - height: 250.h, + height: 280.h, padding: EdgeInsets.only( left: 16.w, right: 16.w, diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index f7e60731..1308a39d 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -const localBaseUrl = "http://192.168.10.78:8765/app/";///本地 +const localBaseUrl = "https://pos.api.lotus-wallet.com/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index db673ef1..d4d2e1d1 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -63,7 +63,7 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -const localBaseUrl = "http://192.168.10.78:8766/app/";///本地 +const localBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 diff --git a/lib/settlement/settlement_view/activity_coupon_remarks.dart b/lib/settlement/settlement_view/activity_coupon_remarks.dart index 0357caf6..22e4904f 100644 --- a/lib/settlement/settlement_view/activity_coupon_remarks.dart +++ b/lib/settlement/settlement_view/activity_coupon_remarks.dart @@ -96,9 +96,9 @@ class _ActivityCouponRemarks extends State { ), ), ), - Switch.adaptive( + CupertinoSwitch( value: (widget.coupons != null && widget.coupons != ""||widget.promotions != null && widget.promotions != "") ? false:vipSelect, - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + // materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, activeColor: Color(0xff32A060), onChanged: (bool value) { setState(() { diff --git a/lib/settlement/settlement_view/settlement_order_commodity.dart b/lib/settlement/settlement_view/settlement_order_commodity.dart index f7ba8de5..fb776ca0 100644 --- a/lib/settlement/settlement_view/settlement_order_commodity.dart +++ b/lib/settlement/settlement_view/settlement_order_commodity.dart @@ -105,7 +105,7 @@ class _SettlementOrderCommodity extends State { ); } - if(widget.useVipPriceSelect){ + if(widget.useVipPriceSelect ){ widgets.add(vipItem(Color(0xFFFF7A1A), "VIP优惠", widget?.settleOrderInfo?.discountAmount ?? "")); } diff --git a/lib/store/store_order.dart b/lib/store/store_order.dart index 03790d89..f2bea6e1 100644 --- a/lib/store/store_order.dart +++ b/lib/store/store_order.dart @@ -211,17 +211,7 @@ class _StoreOrderPage extends State @override Widget build(BuildContext context) { - return WillPopScope( - onWillPop: () async { - if (dialogShowing) { - debugPrint("ssssasdadsasdadasd"); - SmartDialog.dismiss(); - return false; - } else { - return true; - } - }, - child:Container( + return Container( color: Colors.white, child: Stack( children: [ @@ -510,7 +500,7 @@ class _StoreOrderPage extends State onTap: () { // if(AppUtils.compareTime(storeInfo.openStartTime,DateFormat('HH:mm:ss').format(DateTime.now())) // &&(!AppUtils.compareTime(storeInfo.openEndTime,DateFormat('HH:mm:ss').format(DateTime.now())))){ - toDownOrder(); + toDownOrder(); // } // else // SmartDialog.showToast("营业时间:${storeInfo.openStartTime}-${storeInfo.openEndTime}", alignment: Alignment.center); @@ -565,7 +555,7 @@ class _StoreOrderPage extends State ), ), ], - ))); + )); } ///领取优惠券 diff --git a/lib/store/store_view/product_meals_sku.dart b/lib/store/store_view/product_meals_sku.dart index 4f7433af..cfa3906d 100644 --- a/lib/store/store_view/product_meals_sku.dart +++ b/lib/store/store_view/product_meals_sku.dart @@ -360,17 +360,16 @@ class _ProductMealsSku extends State { }, ), if (productSetMeals[position].productInfoList[index].productAttrInfoList[0].attrName != "") - GestureDetector( - onTap: (){ - showSkuDialog(position,index); - }, - child: - Icon( - Icons.chevron_right, - color: Colors.black, - size: 18, - ), - ) + GestureDetector( + onTap: (){ + showSkuDialog(position,index); + }, + child: Icon( + Icons.chevron_right, + color: Colors.black, + size: 18, + ), + ) ], ), SizedBox(height: 8.h), diff --git a/lib/vip/vip_view/vip_goods_discount.dart b/lib/vip/vip_view/vip_goods_discount.dart index e0ff74c2..330f57a5 100644 --- a/lib/vip/vip_view/vip_goods_discount.dart +++ b/lib/vip/vip_view/vip_goods_discount.dart @@ -184,7 +184,7 @@ class _VipGoodsDiscount extends State { fontSize:13.sp, fontWeight: MyFontWeight.regular, ),), - ), + )), Row( children: [ Text( diff --git a/lib/vip/vip_view/vip_top.dart b/lib/vip/vip_view/vip_top.dart index eaf909c1..080810e3 100644 --- a/lib/vip/vip_view/vip_top.dart +++ b/lib/vip/vip_view/vip_top.dart @@ -258,7 +258,7 @@ class _VipTop extends State { Widget vipCard() { return Container( margin: EdgeInsets.fromLTRB( - 14.w,( MediaQuery.of(context).padding.top + 50.h), 14.w, 8.h), + 14.w,( MediaQuery.of(context).padding.top + 30.h), 14.w, 8.h), width: double.infinity, height: 207.h, decoration: BoxDecoration( @@ -320,7 +320,7 @@ class _VipTop extends State { ///VIP购买套餐 Widget vipCardList() { return Container( - height: 132.h, + height: 136.h, margin: EdgeInsets.symmetric(horizontal: 14.w), child: ListView.builder( scrollDirection: Axis.horizontal, @@ -466,7 +466,7 @@ class _VipTop extends State { topLeft: const Radius.circular(8.0), topRight: const Radius.circular(8.0))), child: Container( - height: 265.h, + height: 275.h, child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, @@ -500,7 +500,7 @@ class _VipTop extends State { height: 11.h, ), Container( - height: 132.h, + height: 136.h, margin: EdgeInsets.symmetric(horizontal: 14.w), child: ListView.builder( scrollDirection: Axis.horizontal, @@ -688,7 +688,7 @@ class _VipTop extends State { Widget buildBottomSheetWidget(BuildContext context, state) { return Container( - padding: EdgeInsets.all(16), + padding: EdgeInsets.only(top: 16.h,left: 16.w,right: 16.w,bottom:35.h), decoration: new BoxDecoration( color: Colors.white, borderRadius: new BorderRadius.only( @@ -893,7 +893,7 @@ class _VipTop extends State { ) ], ), - ) + ), ], ), )); diff --git a/pubspec.lock b/pubspec.lock index b1f43fda..4d460852 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -70,14 +70,14 @@ packages: name: chewie url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "1.3.3" chewie_audio: dependency: "direct main" description: name: chewie_audio url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" + version: "1.3.0" clock: dependency: transitive description: @@ -133,14 +133,14 @@ packages: name: ffi url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.1" + version: "2.0.1" file: dependency: transitive description: name: file url: "https://pub.flutter-io.cn" source: hosted - version: "6.1.2" + version: "6.1.4" flare_flutter: dependency: "direct main" description: @@ -300,7 +300,7 @@ packages: name: fluwx url: "https://pub.flutter-io.cn" source: hosted - version: "3.9.1" + version: "3.10.0" font_awesome_flutter: dependency: "direct main" description: @@ -328,7 +328,7 @@ packages: name: html url: "https://pub.flutter-io.cn" source: hosted - version: "0.15.0" + version: "0.15.1" http_parser: dependency: transitive description: @@ -377,7 +377,7 @@ packages: name: like_button url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.4" + version: "2.0.5" logger: dependency: "direct main" description: @@ -475,7 +475,7 @@ packages: name: path_provider_linux url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.6" + version: "2.1.7" path_provider_platform_interface: dependency: transitive description: @@ -489,7 +489,7 @@ packages: name: path_provider_windows url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.6" + version: "2.1.3" permission_handler: dependency: "direct main" description: @@ -510,7 +510,7 @@ packages: name: petitparser url: "https://pub.flutter-io.cn" source: hosted - version: "4.1.0" + version: "5.0.0" photo_view: dependency: "direct main" description: @@ -524,7 +524,7 @@ packages: name: pin_input_text_field url: "https://pub.flutter-io.cn" source: hosted - version: "4.1.2" + version: "4.2.0" platform: dependency: transitive description: @@ -545,14 +545,14 @@ packages: name: process url: "https://pub.flutter-io.cn" source: hosted - version: "4.2.3" + version: "4.2.4" provider: dependency: transitive description: name: provider url: "https://pub.flutter-io.cn" source: hosted - version: "6.0.3" + version: "6.0.4" pull_to_refresh: dependency: "direct main" description: @@ -615,21 +615,35 @@ packages: name: shared_preferences url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.7" + version: "2.0.15" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.0.14" + shared_preferences_ios: + dependency: transitive + description: + name: shared_preferences_ios + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.1.1" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.4" + version: "2.1.1" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.2" + version: "2.0.4" shared_preferences_platform_interface: dependency: transitive description: @@ -650,14 +664,14 @@ packages: name: shared_preferences_windows url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.4" + version: "2.1.1" sharesdk_plugin: dependency: "direct main" description: name: sharesdk_plugin url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.4" + version: "1.3.5" simple_gesture_detector: dependency: transitive description: @@ -755,14 +769,14 @@ packages: name: tuple url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.0" + version: "2.0.1" typed_data: dependency: transitive description: name: typed_data url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0" + version: "1.3.1" url_launcher: dependency: "direct main" description: @@ -818,7 +832,21 @@ packages: name: video_player url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.3" + version: "2.2.19" + video_player_android: + dependency: transitive + description: + name: video_player_android + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.3.4" + video_player_avfoundation: + dependency: transitive + description: + name: video_player_avfoundation + url: "https://pub.flutter-io.cn" + source: hosted + version: "2.3.7" video_player_platform_interface: dependency: transitive description: @@ -832,14 +860,14 @@ packages: name: video_player_web url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.10" + version: "2.0.12" wakelock: dependency: transitive description: name: wakelock url: "https://pub.flutter-io.cn" source: hosted - version: "0.5.6" + version: "0.6.2" wakelock_macos: dependency: transitive description: @@ -867,35 +895,35 @@ packages: name: wakelock_windows url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.0" + version: "0.2.1" webview_flutter: dependency: transitive description: name: webview_flutter url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.13" + version: "2.0.14" win32: dependency: transitive description: name: win32 url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.10" + version: "3.0.1" xdg_directories: dependency: transitive description: name: xdg_directories url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.0+1" + version: "0.2.0+2" xml: dependency: transitive description: name: xml url: "https://pub.flutter-io.cn" source: hosted - version: "5.1.2" + version: "5.4.1" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.17.0 <3.0.0" flutter: ">=3.0.0"