xt / Flutter-ReserveApp · Commits

Go to a project

Commit e7d584ea42af4b8f0f140ecaf1f624cfe8b7f2b8

Authored by wdn127929
1 parent 4a7c19ec
build: skipped

泰国版本

Inline Side-by-side
Showing 4 changed files with 59 additions and 9 deletions
@@ -92,6 +92,18 @@ PODS: @@ -92,6 +92,18 @@ PODS:
92 - FMDB/Core 92 - FMDB/Core
93 - foundation_fluttify (0.0.1): 93 - foundation_fluttify (0.0.1):
94 - Flutter 94 - Flutter
  95 + - geocoding_ios (1.0.5):
  96 + - Flutter
  97 + - geolocator_apple (1.2.0):
  98 + - Flutter
  99 + - google_maps_flutter_ios (0.0.1):
  100 + - Flutter
  101 + - GoogleMaps (< 8.0)
  102 + - GoogleMaps (6.2.1):
  103 + - GoogleMaps/Maps (= 6.2.1)
  104 + - GoogleMaps/Base (6.2.1)
  105 + - GoogleMaps/Maps (6.2.1):
  106 + - GoogleMaps/Base
95 - image_cropper (0.0.4): 107 - image_cropper (0.0.4):
96 - Flutter 108 - Flutter
97 - TOCropViewController (~> 2.6.1) 109 - TOCropViewController (~> 2.6.1)
@@ -196,6 +208,9 @@ DEPENDENCIES: @@ -196,6 +208,9 @@ DEPENDENCIES:
196 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`) 208 - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
197 - fluwx (from `.symlinks/plugins/fluwx/ios`) 209 - fluwx (from `.symlinks/plugins/fluwx/ios`)
198 - foundation_fluttify (from `.symlinks/plugins/foundation_fluttify/ios`) 210 - foundation_fluttify (from `.symlinks/plugins/foundation_fluttify/ios`)
  211 + - geocoding_ios (from `.symlinks/plugins/geocoding_ios/ios`)
  212 + - geolocator_apple (from `.symlinks/plugins/geolocator_apple/ios`)
  213 + - google_maps_flutter_ios (from `.symlinks/plugins/google_maps_flutter_ios/ios`)
199 - image_cropper (from `.symlinks/plugins/image_cropper/ios`) 214 - image_cropper (from `.symlinks/plugins/image_cropper/ios`)
200 - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`) 215 - image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
201 - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) 216 - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
@@ -225,6 +240,7 @@ SPEC REPOS: @@ -225,6 +240,7 @@ SPEC REPOS:
225 - BIJKPlayer 240 - BIJKPlayer
226 - Bugly 241 - Bugly
227 - FMDB 242 - FMDB
  243 + - GoogleMaps
228 - libwebp 244 - libwebp
229 - Mantle 245 - Mantle
230 - MTBBarcodeScanner 246 - MTBBarcodeScanner
@@ -295,6 +311,12 @@ EXTERNAL SOURCES: @@ -295,6 +311,12 @@ EXTERNAL SOURCES:
295 :path: ".symlinks/plugins/fluwx/ios" 311 :path: ".symlinks/plugins/fluwx/ios"
296 foundation_fluttify: 312 foundation_fluttify:
297 :path: ".symlinks/plugins/foundation_fluttify/ios" 313 :path: ".symlinks/plugins/foundation_fluttify/ios"
  314 + geocoding_ios:
  315 + :path: ".symlinks/plugins/geocoding_ios/ios"
  316 + geolocator_apple:
  317 + :path: ".symlinks/plugins/geolocator_apple/ios"
  318 + google_maps_flutter_ios:
  319 + :path: ".symlinks/plugins/google_maps_flutter_ios/ios"
298 image_cropper: 320 image_cropper:
299 :path: ".symlinks/plugins/image_cropper/ios" 321 :path: ".symlinks/plugins/image_cropper/ios"
300 image_gallery_saver: 322 image_gallery_saver:
@@ -370,6 +392,10 @@ SPEC CHECKSUMS: @@ -370,6 +392,10 @@ SPEC CHECKSUMS:
370 fluwx: e9e728cfdb80e82dac5f4ff974b1901a7939dcd0 392 fluwx: e9e728cfdb80e82dac5f4ff974b1901a7939dcd0
371 FMDB: 728731dd336af3936ce00f91d9d8495f5718a0e6 393 FMDB: 728731dd336af3936ce00f91d9d8495f5718a0e6
372 foundation_fluttify: 0c45145e3fad1fb99188e4979daed5b24cd9b278 394 foundation_fluttify: 0c45145e3fad1fb99188e4979daed5b24cd9b278
  395 + geocoding_ios: d7460f56e80e118d57678efe5c2cdc888739ff18
  396 + geolocator_apple: 9bcea1918ff7f0062d98345d238ae12718acfbc1
  397 + google_maps_flutter_ios: abdac20d6ce8931f6ebc5f46616df241bfaa2cfd
  398 + GoogleMaps: 20d7b12be49a14287f797e88e0e31bc4156aaeb4
373 image_cropper: a3291c624a953049bc6a02e1f8c8ceb162a24b25 399 image_cropper: a3291c624a953049bc6a02e1f8c8ceb162a24b25
374 image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb 400 image_gallery_saver: cb43cc43141711190510e92c460eb1655cd343cb
375 image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5 401 image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
@@ -336,6 +336,8 @@ @@ -336,6 +336,8 @@
336 "${BUILT_PRODUCTS_DIR}/flutter_statusbarcolor_ns/flutter_statusbarcolor_ns.framework", 336 "${BUILT_PRODUCTS_DIR}/flutter_statusbarcolor_ns/flutter_statusbarcolor_ns.framework",
337 "${BUILT_PRODUCTS_DIR}/flutter_wxwork/flutter_wxwork.framework", 337 "${BUILT_PRODUCTS_DIR}/flutter_wxwork/flutter_wxwork.framework",
338 "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework", 338 "${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
  339 + "${BUILT_PRODUCTS_DIR}/geocoding_ios/geocoding_ios.framework",
  340 + "${BUILT_PRODUCTS_DIR}/geolocator_apple/geolocator_apple.framework",
339 "${BUILT_PRODUCTS_DIR}/image_cropper/image_cropper.framework", 341 "${BUILT_PRODUCTS_DIR}/image_cropper/image_cropper.framework",
340 "${BUILT_PRODUCTS_DIR}/image_gallery_saver/image_gallery_saver.framework", 342 "${BUILT_PRODUCTS_DIR}/image_gallery_saver/image_gallery_saver.framework",
341 "${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework", 343 "${BUILT_PRODUCTS_DIR}/image_picker_ios/image_picker_ios.framework",
@@ -385,6 +387,8 @@ @@ -385,6 +387,8 @@
385 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_statusbarcolor_ns.framework", 387 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_statusbarcolor_ns.framework",
386 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_wxwork.framework", 388 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_wxwork.framework",
387 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework", 389 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
  390 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geocoding_ios.framework",
  391 + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/geolocator_apple.framework",
388 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_cropper.framework", 392 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_cropper.framework",
389 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_gallery_saver.framework", 393 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_gallery_saver.framework",
390 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework", 394 "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker_ios.framework",
@@ -439,10 +443,12 @@ @@ -439,10 +443,12 @@
439 inputPaths = ( 443 inputPaths = (
440 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", 444 "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh",
441 "${PODS_ROOT}/AMap3DMap-NO-IDFA/MAMapKit.framework/AMap.bundle", 445 "${PODS_ROOT}/AMap3DMap-NO-IDFA/MAMapKit.framework/AMap.bundle",
  446 + "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
442 ); 447 );
443 name = "[CP] Copy Pods Resources"; 448 name = "[CP] Copy Pods Resources";
444 outputPaths = ( 449 outputPaths = (
445 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AMap.bundle", 450 "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AMap.bundle",
  451 + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
446 ); 452 );
447 runOnlyForDeploymentPostprocessing = 0; 453 runOnlyForDeploymentPostprocessing = 0;
448 shellPath = /bin/sh; 454 shellPath = /bin/sh;
@@ -549,7 +555,7 @@ @@ -549,7 +555,7 @@
549 CODE_SIGN_IDENTITY = "Apple Development"; 555 CODE_SIGN_IDENTITY = "Apple Development";
550 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; 556 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
551 CODE_SIGN_STYLE = Manual; 557 CODE_SIGN_STYLE = Manual;
552 - CURRENT_PROJECT_VERSION = 534; 558 + CURRENT_PROJECT_VERSION = 5410;
553 DEVELOPMENT_TEAM = 8J59HM8B82; 559 DEVELOPMENT_TEAM = 8J59HM8B82;
554 "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8J59HM8B82; 560 "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8J59HM8B82;
555 ENABLE_BITCODE = NO; 561 ENABLE_BITCODE = NO;
@@ -566,12 +572,12 @@ @@ -566,12 +572,12 @@
566 "$(inherited)", 572 "$(inherited)",
567 "$(PROJECT_DIR)/Flutter", 573 "$(PROJECT_DIR)/Flutter",
568 ); 574 );
569 - MARKETING_VERSION = 5.3.4; 575 + MARKETING_VERSION = 5.4.1;
570 PODS_ROOT = "$(inherited)"; 576 PODS_ROOT = "$(inherited)";
571 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 577 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
572 PRODUCT_NAME = Runner; 578 PRODUCT_NAME = Runner;
573 PROVISIONING_PROFILE_SPECIFIER = "11.12 naji"; 579 PROVISIONING_PROFILE_SPECIFIER = "11.12 naji";
574 - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "11.12 naji appstore"; 580 + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "11.12 naji hoc";
575 SWIFT_ENABLE_BATCH_MODE = NO; 581 SWIFT_ENABLE_BATCH_MODE = NO;
576 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 582 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
577 SWIFT_VERSION = 5.0; 583 SWIFT_VERSION = 5.0;
@@ -703,7 +709,7 @@ @@ -703,7 +709,7 @@
703 CODE_SIGN_IDENTITY = "Apple Development"; 709 CODE_SIGN_IDENTITY = "Apple Development";
704 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; 710 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
705 CODE_SIGN_STYLE = Manual; 711 CODE_SIGN_STYLE = Manual;
706 - CURRENT_PROJECT_VERSION = 534; 712 + CURRENT_PROJECT_VERSION = 5410;
707 DEVELOPMENT_TEAM = 8J59HM8B82; 713 DEVELOPMENT_TEAM = 8J59HM8B82;
708 "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8J59HM8B82; 714 "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8J59HM8B82;
709 ENABLE_BITCODE = NO; 715 ENABLE_BITCODE = NO;
@@ -721,13 +727,13 @@ @@ -721,13 +727,13 @@
721 "$(inherited)", 727 "$(inherited)",
722 "$(PROJECT_DIR)/Flutter", 728 "$(PROJECT_DIR)/Flutter",
723 ); 729 );
724 - MARKETING_VERSION = 5.3.4; 730 + MARKETING_VERSION = 5.4.1;
725 PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json"; 731 PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json";
726 PODS_ROOT = "$(inherited)"; 732 PODS_ROOT = "$(inherited)";
727 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 733 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
728 PRODUCT_NAME = Runner; 734 PRODUCT_NAME = Runner;
729 PROVISIONING_PROFILE_SPECIFIER = "11.12 naji"; 735 PROVISIONING_PROFILE_SPECIFIER = "11.12 naji";
730 - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "11.12 naji appstore"; 736 + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "11.12 naji hoc";
731 SWIFT_ENABLE_BATCH_MODE = NO; 737 SWIFT_ENABLE_BATCH_MODE = NO;
732 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 738 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
733 SWIFT_OPTIMIZATION_LEVEL = "-Onone"; 739 SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -748,7 +754,7 @@ @@ -748,7 +754,7 @@
748 CODE_SIGN_IDENTITY = "Apple Development"; 754 CODE_SIGN_IDENTITY = "Apple Development";
749 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; 755 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
750 CODE_SIGN_STYLE = Manual; 756 CODE_SIGN_STYLE = Manual;
751 - CURRENT_PROJECT_VERSION = 534; 757 + CURRENT_PROJECT_VERSION = 5410;
752 DEVELOPMENT_TEAM = 8J59HM8B82; 758 DEVELOPMENT_TEAM = 8J59HM8B82;
753 "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8J59HM8B82; 759 "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8J59HM8B82;
754 ENABLE_BITCODE = NO; 760 ENABLE_BITCODE = NO;
@@ -765,12 +771,12 @@ @@ -765,12 +771,12 @@
765 "$(inherited)", 771 "$(inherited)",
766 "$(PROJECT_DIR)/Flutter", 772 "$(PROJECT_DIR)/Flutter",
767 ); 773 );
768 - MARKETING_VERSION = 5.3.4; 774 + MARKETING_VERSION = 5.4.1;
769 PODS_ROOT = "$(inherited)"; 775 PODS_ROOT = "$(inherited)";
770 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 776 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
771 PRODUCT_NAME = Runner; 777 PRODUCT_NAME = Runner;
772 PROVISIONING_PROFILE_SPECIFIER = "11.12 naji"; 778 PROVISIONING_PROFILE_SPECIFIER = "11.12 naji";
773 - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "11.12 naji appstore"; 779 + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "11.12 naji hoc";
774 SWIFT_ENABLE_BATCH_MODE = NO; 780 SWIFT_ENABLE_BATCH_MODE = NO;
775 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 781 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
776 SWIFT_VERSION = 5.0; 782 SWIFT_VERSION = 5.0;
@@ -94,6 +94,10 @@ @@ -94,6 +94,10 @@
94 <string>需要您的同意,APP才能访问您的相册来上传消费清单</string> 94 <string>需要您的同意,APP才能访问您的相册来上传消费清单</string>
95 <key>NSSpeechRecognitionUsageDescription</key> 95 <key>NSSpeechRecognitionUsageDescription</key>
96 <string>需要您的同意,APP才能访问语音识别</string> 96 <string>需要您的同意,APP才能访问语音识别</string>
  97 + <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
  98 + <string>需要您的同意,APP才能在创建店铺时选择店铺位置</string>
  99 + <key>NSLocationAlwaysUsageDescription</key>
  100 + <string>需要您的同意,APP才能在创建店铺时选择店铺位置</string>
97 <key>UIBackgroundModes</key> 101 <key>UIBackgroundModes</key>
98 <array> 102 <array>
99 <string>fetch</string> 103 <string>fetch</string>
@@ -314,6 +314,12 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> { @@ -314,6 +314,12 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
314 mapType: MapType.normal, 314 mapType: MapType.normal,
315 315
316 initialCameraPosition: _kGooglePlex, 316 initialCameraPosition: _kGooglePlex,
  317 + onTap: (position){
  318 + _loadData(LatLng(
  319 + position.latitude, position.longitude));
  320 + }
  321 +
  322 + ,
317 onMapCreated: (GoogleMapController controller) { 323 onMapCreated: (GoogleMapController controller) {
318 _controller.complete(controller); 324 _controller.complete(controller);
319 }, 325 },
@@ -490,6 +496,14 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> { @@ -490,6 +496,14 @@ class _MapChoicePointPageState extends State<MapChoicePointPage> {
490 // PlacesSearchResponse response = await _places.searchNearbyWithRadius(Location(lat: 31.0424, lng: 42.421), 500); 496 // PlacesSearchResponse response = await _places.searchNearbyWithRadius(Location(lat: 31.0424, lng: 42.421), 500);
491 Places.PlacesSearchResponse response = await _places.searchNearbyWithRadius( 497 Places.PlacesSearchResponse response = await _places.searchNearbyWithRadius(
492 Places.Location(lat: latLng.latitude, lng: latLng.longitude), 1500); 498 Places.Location(lat: latLng.latitude, lng: latLng.longitude), 1500);
  499 + // Places.PlacesSearchResponse response = await _places.searchByText(
  500 + // address,
  501 + // radius: 500,
  502 +
  503 + // );
  504 +
  505 +
  506 +
493 // Places.PlacesSearchResponse response = await _places.searchNearbyWithRankBy( 507 // Places.PlacesSearchResponse response = await _places.searchNearbyWithRankBy(
494 // Places.Location(lat: latLng.latitude, lng: latLng.longitude), "district"); 508 // Places.Location(lat: latLng.latitude, lng: latLng.longitude), "district");
495 // Places.PlacesSearchResult fff = response.results[0]; 509 // Places.PlacesSearchResult fff = response.results[0];