fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/wu_2023_map' into wu_2023_map 

# Conflicts:
#	lib/union/location_map_page.dart
dev
huixiang_app 1 year ago
parent
1a0c6f7282 b99e7b03a9
commit
b09e677281
5 changed files with 69 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ios/Podfile
  2. 29
      ios/Podfile.lock
  3. 6
      ios/Runner.xcodeproj/project.pbxproj
  4. 65
      pubspec.lock
  5. 5
      pubspec.yaml

2
ios/Podfile
Unescape View File

@ -45,7 +45,7 @@ post_install do |installer|
flutter_additional_ios_build_settings(target) flutter_additional_ios_build_settings(target)
target.build_configurations.each do |config| target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'NO' 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 end
end end

29
ios/Podfile.lock
Unescape View File

@ -45,12 +45,11 @@ PODS:
- Flutter - Flutter
- fluwx (0.0.1): - fluwx (0.0.1):
- Flutter - Flutter
- "OpenWeChatSDK (~> 1.9.2+1)" - mob_sharesdk/ShareSDKPlatforms/WeChatFull
- image_pickers (0.0.1): - image_pickers (0.0.1):
- AFNetworking - AFNetworking
- Flutter - Flutter
- SDWebImage - ZLPhotoBrowser-objc (= 1.0.4)
- ZLPhotoBrowser (~> 4.3.9)
- mob_sharesdk (4.4.15): - mob_sharesdk (4.4.15):
- mob_sharesdk/ShareSDK (= 4.4.15) - mob_sharesdk/ShareSDK (= 4.4.15)
- MOBFoundation (>= 3.2.9) - MOBFoundation (>= 3.2.9)
@ -143,7 +142,7 @@ PODS:
- mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.15): - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.15):
- mob_sharesdk/ShareSDK - mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9) - MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.15): - mob_sharesdk/ShareSDKPlatforms/WeChatFull (4.4.15):
- mob_sharesdk/ShareSDK - mob_sharesdk/ShareSDK
- MOBFoundation (>= 3.2.9) - MOBFoundation (>= 3.2.9)
- mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.15): - mob_sharesdk/ShareSDKPlatforms/WeWork (4.4.15):
@ -164,7 +163,6 @@ PODS:
- MOBFoundation (3.2.49) - MOBFoundation (3.2.49)
- number_precision (0.0.1): - number_precision (0.0.1):
- Flutter - Flutter
- "OpenWeChatSDK (1.9.9+1)"
- package_info (0.0.1): - package_info (0.0.1):
- Flutter - Flutter
- path_provider (0.0.1): - path_provider (0.0.1):
@ -211,7 +209,7 @@ PODS:
- mob_sharesdk/ShareSDKPlatforms/Twitter - mob_sharesdk/ShareSDKPlatforms/Twitter
- mob_sharesdk/ShareSDKPlatforms/VKontakte - mob_sharesdk/ShareSDKPlatforms/VKontakte
- mob_sharesdk/ShareSDKPlatforms/WatermelonVideo - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo
- mob_sharesdk/ShareSDKPlatforms/WeChat_Lite - mob_sharesdk/ShareSDKPlatforms/WeChatFull
- mob_sharesdk/ShareSDKPlatforms/WeWork - mob_sharesdk/ShareSDKPlatforms/WeWork
- mob_sharesdk/ShareSDKPlatforms/WhatsApp - mob_sharesdk/ShareSDKPlatforms/WhatsApp
- mob_sharesdk/ShareSDKPlatforms/Yixin - mob_sharesdk/ShareSDKPlatforms/Yixin
@ -241,9 +239,8 @@ PODS:
- Flutter - Flutter
- webview_flutter (0.0.1): - webview_flutter (0.0.1):
- Flutter - Flutter
- ZLPhotoBrowser (4.3.9): - ZLPhotoBrowser-objc (1.0.4):
- ZLPhotoBrowser/Core (= 4.3.9) - SDWebImage
- ZLPhotoBrowser/Core (4.3.9)
DEPENDENCIES: DEPENDENCIES:
- emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`) - emoji_picker_flutter (from `.symlinks/plugins/emoji_picker_flutter/ios`)
@ -279,13 +276,12 @@ SPEC REPOS:
- BMKLocationKit - BMKLocationKit
- mob_sharesdk - mob_sharesdk
- MOBFoundation - MOBFoundation
- OpenWeChatSDK
- SDWebImage - SDWebImage
- SSZipArchive - SSZipArchive
- TPNS-iOS - TPNS-iOS
- UMCommon - UMCommon
- UMDevice - UMDevice
- ZLPhotoBrowser - ZLPhotoBrowser-objc
EXTERNAL SOURCES: EXTERNAL SOURCES:
emoji_picker_flutter: emoji_picker_flutter:
@ -348,19 +344,18 @@ SPEC CHECKSUMS:
flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08 flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08
flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1 flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1
flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf
fluwx: 79c66b6d795ab8208262ada215d9e60388cfe492 fluwx: 838466d89c1ba099f6eec36c514801658371cda5
image_pickers: 4406949954a5eb4fac5ada5f13810e6419ef4467 image_pickers: 25c8916d358bc9d2707cb470ba3d57497f105773
mob_sharesdk: 0698d60b3c1549a5b0bcfdec6f407439dd2960c0 mob_sharesdk: 0698d60b3c1549a5b0bcfdec6f407439dd2960c0
MOBFoundation: 6df2684b4db4f0f5bd71b0623f82e11271bf7ac8 MOBFoundation: 6df2684b4db4f0f5bd71b0623f82e11271bf7ac8
number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8 number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8
OpenWeChatSDK: ea48e9db20645f78128db9091893910280b8e4b1
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259 path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86 scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86
SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3 SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3
shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472 shared_preferences_foundation: 986fc17f3d3251412d18b0265f9c64113a8c2472
sharesdk_plugin: 7e8abfa7c4aa4c20d94e0a162406ba79a971f2ca sharesdk_plugin: b105d82bed39e1d229591999058ab1e12ff95001
SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef SSZipArchive: fe6a26b2a54d5a0890f2567b5cc6de5caa600aef
thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad
tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5 tobias: 2aded9b83e3663b907360a800d8e3c13284f25c5
@ -373,8 +368,8 @@ SPEC CHECKSUMS:
video_player_avfoundation: 6d971a232d72e6ee25368378d48a079dea01f1cf video_player_avfoundation: 6d971a232d72e6ee25368378d48a079dea01f1cf
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232 webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232
ZLPhotoBrowser: 02b3569b8f702d2e153e8fdb1f6b32fef3a2867c ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
PODFILE CHECKSUM: f4ea28c741a7c9a1c417c066f9cfd7b29654dd12 PODFILE CHECKSUM: f8bac8842dd5d4f36a3709c129ae7a2ccd5be619
COCOAPODS: 1.11.3 COCOAPODS: 1.11.3

6
ios/Runner.xcodeproj/project.pbxproj
Unescape View File

@ -617,7 +617,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -819,7 +819,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -912,7 +912,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (

65
pubspec.lock
Unescape View File

@ -215,7 +215,7 @@ packages:
name: flutter_easyloading name: flutter_easyloading
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "3.0.0" version: "3.0.5"
flutter_html: flutter_html:
dependency: "direct main" dependency: "direct main"
description: description:
@ -269,7 +269,7 @@ packages:
name: flutter_slidable name: flutter_slidable
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.3.0" version: "1.3.2"
flutter_smart_dialog: flutter_smart_dialog:
dependency: "direct main" dependency: "direct main"
description: description:
@ -283,14 +283,14 @@ packages:
name: flutter_spinkit name: flutter_spinkit
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "5.0.0" version: "5.2.0"
flutter_staggered_grid_view: flutter_staggered_grid_view:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_staggered_grid_view name: flutter_staggered_grid_view
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.4.0" version: "0.4.1"
flutter_svg: flutter_svg:
dependency: "direct main" dependency: "direct main"
description: description:
@ -328,7 +328,7 @@ packages:
name: font_awesome_flutter name: font_awesome_flutter
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "9.1.0" version: "9.2.0"
gbk2utf8: gbk2utf8:
dependency: "direct main" dependency: "direct main"
description: description:
@ -405,14 +405,14 @@ packages:
name: like_button name: like_button
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.2" version: "2.0.5"
logger: logger:
dependency: "direct main" dependency: "direct main"
description: description:
name: logger name: logger
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.0" version: "1.4.0"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
@ -531,7 +531,7 @@ packages:
name: permission_handler name: permission_handler
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "5.0.1+1" version: "5.1.0+2"
permission_handler_platform_interface: permission_handler_platform_interface:
dependency: transitive dependency: transitive
description: description:
@ -559,7 +559,7 @@ packages:
name: pin_input_text_field name: pin_input_text_field
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "4.1.2" version: "4.4.1"
platform: platform:
dependency: transitive dependency: transitive
description: description:
@ -643,7 +643,7 @@ packages:
name: scan name: scan
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.5.0" version: "1.6.0"
shared_preferences: shared_preferences:
dependency: "direct main" dependency: "direct main"
description: description:
@ -699,7 +699,7 @@ packages:
name: sharesdk_plugin name: sharesdk_plugin
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.3.4" version: "1.3.10"
shimmer: shimmer:
dependency: "direct main" dependency: "direct main"
description: description:
@ -781,13 +781,13 @@ packages:
name: tobias name: tobias
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.4.1" version: "2.4.2"
tpns_flutter_plugin: tpns_flutter_plugin:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." path: "."
ref: "V1.1.6" ref: "V1.1.6"
resolved-ref: c21ce8a966f9238a5bf70a617c30468b79baa5a7 resolved-ref: a7e45d151171f9ec4b56bc97a720f545aa4a8722
url: "https://github.com/TencentCloud/TPNS-Flutter-Plugin" url: "https://github.com/TencentCloud/TPNS-Flutter-Plugin"
source: git source: git
version: "1.1.6" version: "1.1.6"
@ -818,14 +818,49 @@ packages:
name: umeng_common_sdk name: umeng_common_sdk
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.2.3" version: "1.2.6"
url_launcher: url_launcher:
dependency: "direct main" dependency: "direct main"
description: description:
name: url_launcher name: url_launcher
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted 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: vector_math:
dependency: transitive dependency: transitive
description: description:

5
pubspec.yaml
Unescape View File

@ -15,7 +15,8 @@ dependencies:
sdk: flutter sdk: flutter
fluwx: 3.9.0+2 fluwx: 3.9.0+2
tobias: 2.4.1 tobias: ^2.4.1
gradient_widgets: ^0.6.0 gradient_widgets: ^0.6.0
@ -67,7 +68,7 @@ dependencies:
url_launcher: ^5.0.0 url_launcher: ^5.0.0
#多图， 裁剪 #多图， 裁剪
image_pickers: ^2.0.0 image_pickers: 2.0.0
# flutter_scankit: ^1.2.0 # flutter_scankit: ^1.2.0
# qrscan: ^0.3.1 # qrscan: ^0.3.1

Write Preview
Loading…
Cancel
Save