From 0e81aed07b9cb206185cd586ca49559748aa9559 Mon Sep 17 00:00:00 2001 From: fmk Date: Tue, 5 Sep 2023 16:33:13 +0800 Subject: [PATCH] =?UTF-8?q?ios=20=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Podfile | 2 +- ios/Podfile.lock | 29 +++++-------- ios/Runner.xcodeproj/project.pbxproj | 6 +-- lib/union/location_map_page.dart | 17 +++++++- lib/union/union_list.dart | 4 +- pubspec.lock | 65 +++++++++++++++++++++------- pubspec.yaml | 5 ++- 7 files changed, 86 insertions(+), 42 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index ed9a15bc..a6a40c03 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -45,7 +45,7 @@ post_install do |installer| flutter_additional_ios_build_settings(target) target.build_configurations.each do |config| config.build_settings['ENABLE_BITCODE'] = 'NO' - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0' + config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0' end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d5042f22..7dc542bd 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -45,12 +45,11 @@ PODS: - Flutter - fluwx (0.0.1): - Flutter - - "OpenWeChatSDK (~> 1.9.2+1)" + - mob_sharesdk/ShareSDKPlatforms/WeChatFull - image_pickers (0.0.1): - AFNetworking - Flutter - - SDWebImage - - ZLPhotoBrowser (~> 4.3.9) + - ZLPhotoBrowser-objc (= 1.0.4) - mob_sharesdk (4.4.15): - mob_sharesdk/ShareSDK (= 4.4.15) - MOBFoundation (>= 3.2.9) @@ -143,7 +142,7 @@ PODS: - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.15): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.15): + - mob_sharesdk/ShareSDKPlatforms/WeChatFull (4.4.15): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) - mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.15): @@ -164,7 +163,6 @@ PODS: - MOBFoundation (3.2.49) - number_precision (0.0.1): - Flutter - - "OpenWeChatSDK (1.9.9+1)" - package_info (0.0.1): - Flutter - path_provider (0.0.1): @@ -211,7 +209,7 @@ PODS: - mob_sharesdk/ShareSDKPlatforms/Twitter - mob_sharesdk/ShareSDKPlatforms/VKontakte - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo - - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite + - mob_sharesdk/ShareSDKPlatforms/WeChatFull - mob_sharesdk/ShareSDKPlatforms/WeWork - mob_sharesdk/ShareSDKPlatforms/WhatsApp - mob_sharesdk/ShareSDKPlatforms/Yixin @@ -241,9 +239,8 @@ PODS: - Flutter - webview_flutter (0.0.1): - Flutter - - ZLPhotoBrowser (4.3.9): - - ZLPhotoBrowser/Core (= 4.3.9) - - ZLPhotoBrowser/Core (4.3.9) + - ZLPhotoBrowser-objc (1.0.4): + - SDWebImage DEPENDENCIES: - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`) @@ -279,13 +276,12 @@ SPEC REPOS: - BMKLocationKit - mob_sharesdk - MOBFoundation - - OpenWeChatSDK - SDWebImage - SSZipArchive - TPNS-iOS - UMCommon - UMDevice - - ZLPhotoBrowser + - ZLPhotoBrowser-objc EXTERNAL SOURCES: emoji_picker_flutter: @@ -348,19 +344,18 @@ SPEC CHECKSUMS: flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08 flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1 flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf - fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492 - image_pickers: 4406949954a5eb4fac5ada5f13810e6419ef4467 + fluwx: 838466d89c1ba099f6eec36c514801658371cda5 + image_pickers: 25c8916d358bc9d2707cb470ba3d57497f105773 mob_sharesdk: 0698d60b3c1549a5b0bcfdec6f407439dd2960c0 MOBFoundation: 6df2684b4db4f0f5bd71b0623f82e11271bf7ac8 number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8 - OpenWeChatSDK: ea48e9db20645f78128db9091893910280b8e4b1 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86 SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3 shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472 - sharesdk_plugin: 7e8abfa7c4aa4c20d94e0a162406ba79a971f2ca + sharesdk_plugin: b105d82bed39e1d229591999058ab1e12ff95001 SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5 @@ -373,8 +368,8 @@ SPEC CHECKSUMS: video_player_avfoundation: 6d971a232d72e6ee25368378d48a079dea01f1cf wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232 - ZLPhotoBrowser: 02b3569b8f702d2e153e8fdb1f6b32fef3a2867c + ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736 -PODFILE CHECKSUM: f4ea28c741a7c9a1c417c066f9cfd7b29654dd12 +PODFILE CHECKSUM: f8bac8842dd5d4f36a3709c129ae7a2ccd5be619 COCOAPODS: 1.11.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index a8a9508a..38e89163 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 = 2; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -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 = 2; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -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 = 2; + CURRENT_PROJECT_VERSION = 4; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( diff --git a/lib/union/location_map_page.dart b/lib/union/location_map_page.dart index 1ae4158a..59967a37 100644 --- a/lib/union/location_map_page.dart +++ b/lib/union/location_map_page.dart @@ -1,4 +1,5 @@ import 'dart:convert'; +import 'dart:io'; import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter_baidu_mapapi_base/flutter_baidu_mapapi_base.dart'; @@ -162,7 +163,19 @@ class _LocationMap extends State with WidgetsBindingObserver { Expanded( child: Container( //BMFMapWidget 组件会自动默认沾满全屏，并且挡住所有遮盖物 ,BMFTextureMapWidget不会强制遮盖其他控件。 - child: BMFTextureMapWidget( + child: (Platform.isAndroid) ? BMFTextureMapWidget( + mapOptions: BMFMapOptions( + center: BMFCoordinate( + double.tryParse(widget.arguments["lat"]), + double.tryParse(widget.arguments["lng"]), + ), + showZoomControl: false, + showMapScaleBar: false, + rotateEnabled: false, + zoomLevel: 15, + ), + onBMFMapCreated: onMapCreated, + ) : BMFMapWidget( mapOptions: BMFMapOptions( center: BMFCoordinate( double.tryParse(widget.arguments["lat"]), @@ -460,7 +473,7 @@ class _LocationMap extends State with WidgetsBindingObserver { ? 'assets/image/traffic_texture_unknown.png' : 'assets/image/traffic_texture_smooth.png' ], - width: 16, + width: 16.w.toInt(), lineDashType: BMFLineDashType.LineDashTypeNone, lineCapType: BMFLineCapType.LineCapButt, lineJoinType: BMFLineJoinType.LineJoinRound); diff --git a/lib/union/union_list.dart b/lib/union/union_list.dart index d0a4448f..6361a568 100644 --- a/lib/union/union_list.dart +++ b/lib/union/union_list.dart @@ -195,7 +195,7 @@ class _UnionList extends State with AutomaticKeepAliveClientMixin { Widget buildStoreItem(Store store, position) { return Container( margin: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 12.h), - padding: EdgeInsets.all(12.h), + padding: EdgeInsets.symmetric(horizontal:12.w,vertical: 12.h), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(6)), @@ -307,7 +307,7 @@ class _UnionList extends State with AutomaticKeepAliveClientMixin { SizedBox(height: store.businessService == "" ? 40.h : 23.h), if (storeList[position].productShow != null) Container( - height: 120.h, + height: 100.h, child: ListView.builder( padding: EdgeInsets.zero, itemCount: diff --git a/pubspec.lock b/pubspec.lock index 3fa22321..2da24db9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -215,7 +215,7 @@ packages: name: flutter_easyloading url: "https://pub.flutter-io.cn" source: hosted - version: "3.0.0" + version: "3.0.5" flutter_html: dependency: "direct main" description: @@ -269,7 +269,7 @@ packages: name: flutter_slidable url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.0" + version: "1.3.2" flutter_smart_dialog: dependency: "direct main" description: @@ -283,14 +283,14 @@ packages: name: flutter_spinkit url: "https://pub.flutter-io.cn" source: hosted - version: "5.0.0" + version: "5.2.0" flutter_staggered_grid_view: dependency: "direct main" description: name: flutter_staggered_grid_view url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.0" + version: "0.4.1" flutter_svg: dependency: "direct main" description: @@ -328,7 +328,7 @@ packages: name: font_awesome_flutter url: "https://pub.flutter-io.cn" source: hosted - version: "9.1.0" + version: "9.2.0" gbk2utf8: dependency: "direct main" description: @@ -405,14 +405,14 @@ packages: name: like_button url: "https://pub.flutter-io.cn" source: hosted - version: "2.0.2" + version: "2.0.5" logger: dependency: "direct main" description: name: logger url: "https://pub.flutter-io.cn" source: hosted - version: "1.0.0" + version: "1.4.0" matcher: dependency: transitive description: @@ -531,7 +531,7 @@ packages: name: permission_handler url: "https://pub.flutter-io.cn" source: hosted - version: "5.0.1+1" + version: "5.1.0+2" permission_handler_platform_interface: dependency: transitive description: @@ -559,7 +559,7 @@ packages: name: pin_input_text_field url: "https://pub.flutter-io.cn" source: hosted - version: "4.1.2" + version: "4.4.1" platform: dependency: transitive description: @@ -643,7 +643,7 @@ packages: name: scan url: "https://pub.flutter-io.cn" source: hosted - version: "1.5.0" + version: "1.6.0" shared_preferences: dependency: "direct main" description: @@ -699,7 +699,7 @@ packages: name: sharesdk_plugin url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.4" + version: "1.3.10" shimmer: dependency: "direct main" description: @@ -781,13 +781,13 @@ packages: name: tobias url: "https://pub.flutter-io.cn" source: hosted - version: "2.4.1" + version: "2.4.2" tpns_flutter_plugin: dependency: "direct main" description: path: "." ref: "V1.1.6" - resolved-ref: c21ce8a966f9238a5bf70a617c30468b79baa5a7 + resolved-ref: a7e45d151171f9ec4b56bc97a720f545aa4a8722 url: "https://github.com/TencentCloud/TPNS-Flutter-Plugin" source: git version: "1.1.6" @@ -818,14 +818,49 @@ packages: name: umeng_common_sdk url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.3" + version: "1.2.6" url_launcher: dependency: "direct main" description: name: url_launcher url: "https://pub.flutter-io.cn" source: hosted - version: "5.0.0" + version: "5.7.10" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + url: "https://pub.flutter-io.cn" + source: hosted + 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+9" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + url: "https://pub.flutter-io.cn" + source: hosted + 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.5+3" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.0.1+3" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index c3ac0772..a5850713 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,8 @@ dependencies: sdk: flutter fluwx: 3.9.0+2 - tobias: 2.4.1 + tobias: ^2.4.1 + gradient_widgets: ^0.6.0 @@ -67,7 +68,7 @@ dependencies: url_launcher: ^5.0.0 #多图， 裁剪 - image_pickers: ^2.0.0 + image_pickers: 2.0.0 # flutter_scankit: ^1.2.0 # qrscan: ^0.3.1