Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into HanJiaHui_Branch
# Conflicts: # src/.dart_tool/package_config.json # src/.dart_tool/package_config_subset # src/.flutter-plugins # src/.flutter-plugins-dependencies # src/build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin # src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar # src/build/app/intermediates/dex_archive_input_jar_hashes/debug/out # src/build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin # src/build/app/intermediates/flutter/debug/flutter_build.d # src/build/app/intermediates/flutter/debug/libs.jar # src/build/app/intermediates/incremental/debug-mergeJavaRes/merge-state # src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/zflDT7PXjd9iyTO8EGeysxDQsQ4= # src/build/app/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/build/app/intermediates/incremental/debug/mergeDebugResources/merger.xml # src/build/app/intermediates/incremental/mergeDebugAssets/merger.xml # src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/build/app/intermediates/source_set_path_map/debug/file-map.txt # src/build/app/kotlin/compileDebugKotlin/cacheable/last-build.bin # src/build/app/kotlin/compileDebugKotlin/local-state/build-history.bin # src/build/app/outputs/apk/debug/app-debug.apk # src/build/app/outputs/flutter-apk/app-debug.apk # src/build/app/outputs/flutter-apk/app-debug.apk.sha1 # src/build/app/outputs/logs/manifest-merger-debug-report.txt # src/build/fa1f46848d15fd18dc4e2938a3aa6cef.cache.dill.track.dill # src/build/sqflite/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties # src/build/sqflite/intermediates/incremental/debug/packageDebugResources/merger.xml # src/build/sqflite/intermediates/incremental/mergeDebugJniLibFolders/merger.xml # src/build/sqflite/intermediates/incremental/mergeDebugShaders/merger.xml # src/build/sqflite/intermediates/incremental/packageDebugAssets/merger.xml # src/build/sqflite/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # src/build/sqflite/outputs/logs/manifest-merger-debug-report.txt # src/lib/travelguideapp/ui/pages/MuseumInfoPage.dartHanJiaHui_Branch
@ -1 +1 @@
|
||||
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
|
||||
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}
|
@ -1 +1 @@
|
||||
["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
|
||||
["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/1F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/2F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/3F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/4F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/5F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection0.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection3.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection4.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
|
@ -0,0 +1 @@
|
||||
D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/0.png D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z: D:\\travelguideProject\\travelguideProject\\src\\pubspec.yaml D:\\travelguideProject\\travelguideProject\\src\\assets\\0.png D:\\travelguideProject\\travelguideProject\\src\\assets\\Collection_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\assets\\Museum_Preview.jpg D:\\travelguideProject\\travelguideProject\\src\\assets\\service1.png D:\\travelguideProject\\travelguideProject\\src\\assets\\service2.png C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf D:\\flutter\\flutter\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf D:\\flutter\\flutter\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite_common-2.5.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\synchronized-3.1.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE C:\\Users\\Administrator\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE D:\\flutter\\flutter\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE D:\\flutter\\flutter\\flutter\\packages\\flutter\\LICENSE D:\\travelguideProject\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD664661712
|
@ -0,0 +1 @@
|
||||
{"inputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}
|
@ -0,0 +1 @@
|
||||
{"inputs":[],"outputs":[]}
|
@ -0,0 +1 @@
|
||||
["D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/0.png","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\travelguideProject\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
|
@ -1,2 +1,6 @@
|
||||
# This is a generated file; do not edit or check into version control.
|
||||
<<<<<<< HEAD
|
||||
sqflite=C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\
|
||||
=======
|
||||
sqflite=C:\\Users\\17651\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
|
@ -1 +1,5 @@
|
||||
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 23:37:06.534861","version":"3.13.3"}
|
||||
<<<<<<< HEAD
|
||||
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 23:37:06.534861","version":"3.13.3"}
|
||||
=======
|
||||
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-17 22:31:12.840798","version":"3.13.3"}
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
|
After Width: | Height: | Size: 184 KiB |
After Width: | Height: | Size: 174 KiB |
After Width: | Height: | Size: 207 KiB |
After Width: | Height: | Size: 184 KiB |
After Width: | Height: | Size: 218 KiB |
After Width: | Height: | Size: 152 KiB |
After Width: | Height: | Size: 61 KiB |
After Width: | Height: | Size: 93 KiB |
After Width: | Height: | Size: 35 KiB |
After Width: | Height: | Size: 24 KiB |
@ -1 +1 @@
|
||||
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
|
||||
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}
|
@ -0,0 +1 @@
|
||||
{"inputs":[],"outputs":[]}
|
@ -0,0 +1 @@
|
||||
{"inputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["D:\\travelguideProject\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}
|
@ -0,0 +1 @@
|
||||
{"inputs":[],"outputs":[]}
|
@ -1 +1 @@
|
||||
{"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
||||
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
After Width: | Height: | Size: 184 KiB |
After Width: | Height: | Size: 174 KiB |
After Width: | Height: | Size: 207 KiB |
After Width: | Height: | Size: 184 KiB |
After Width: | Height: | Size: 218 KiB |
After Width: | Height: | Size: 152 KiB |
After Width: | Height: | Size: 61 KiB |
After Width: | Height: | Size: 93 KiB |
After Width: | Height: | Size: 35 KiB |
After Width: | Height: | Size: 24 KiB |
@ -1 +1 @@
|
||||
{"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
||||
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
|
After Width: | Height: | Size: 184 KiB |
After Width: | Height: | Size: 174 KiB |
After Width: | Height: | Size: 207 KiB |
After Width: | Height: | Size: 184 KiB |
After Width: | Height: | Size: 218 KiB |
After Width: | Height: | Size: 152 KiB |
After Width: | Height: | Size: 61 KiB |
After Width: | Height: | Size: 93 KiB |
After Width: | Height: | Size: 35 KiB |
After Width: | Height: | Size: 24 KiB |
@ -1,2 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\build\sqflite\intermediates\library_assets\debug\out"/></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\main\assets"/><source path="D:\travelguideProject\src\build\app\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\build\sqflite\intermediates\library_assets\debug\out"/></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\main\assets"/><source path="D:\travelguideProject\src\build\app\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\build\sqflite\intermediates\library_assets\debug\out"/></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\android\app\src\main\assets"/><source path="E:\travelguideProject\src\build\app\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
|
@ -1,4 +1,9 @@
|
||||
<<<<<<< HEAD
|
||||
#Tue Oct 17 23:35:51 CST 2023
|
||||
base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
=======
|
||||
#Tue Oct 17 22:31:18 CST 2023
|
||||
base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
renamed.0=classes.dex
|
||||
path.0=classes.dex
|
||||
|
@ -1 +1,5 @@
|
||||
06b7c1eab2cea4589a82eebf1f44dc090fa07bc6
|
||||
<<<<<<< HEAD
|
||||
06b7c1eab2cea4589a82eebf1f44dc090fa07bc6
|
||||
=======
|
||||
666db81d039cfbd914dc7f8faae99a319f36c9b7
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
|
@ -0,0 +1 @@
|
||||
o/classes
|
@ -0,0 +1 @@
|
||||
o/classes
|
@ -1 +1,5 @@
|
||||
<<<<<<< HEAD
|
||||
#Tue Oct 17 21:25:06 CST 2023
|
||||
=======
|
||||
#Tue Oct 17 22:07:13 CST 2023
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
|
@ -1,2 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="D:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="E:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="E:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\res"/><source path="E:\travelguideProject\src\build\sqflite\generated\res\rs\debug"/><source path="E:\travelguideProject\src\build\sqflite\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"/><mergedItems/></merger>
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
|
@ -1,2 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\jniLibs"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\jniLibs"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\jniLibs"/></dataSet></merger>
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
|
@ -1,2 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\shaders"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\shaders"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\shaders"/></dataSet></merger>
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
|
@ -1,2 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\assets"/><source path="D:\travelguideProject\src\build\sqflite\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\assets"/></dataSet></merger>
|
||||
<<<<<<< HEAD
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\assets"/><source path="D:\travelguideProject\src\build\sqflite\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\86131\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\assets"/></dataSet></merger>
|
||||
=======
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\main\assets"/><source path="E:\travelguideProject\src\build\sqflite\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\17651\AppData\Local\Pub\Cache\hosted\pub.dev\sqflite-2.3.0\android\src\debug\assets"/></dataSet></merger>
|
||||
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
|
||||
|
@ -0,0 +1,45 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class MapPage extends StatelessWidget {
|
||||
const MapPage({Key? key});
|
||||
|
||||
// 用于构建图片的函数
|
||||
Widget _buildImage(String imagePath, double height, double verticalOffset) {
|
||||
return Center( // 将图片居中
|
||||
child: SizedBox(
|
||||
height: height, // 使用传递的高度参数
|
||||
child: Transform.translate(
|
||||
offset: Offset(0, verticalOffset), // 使用传递的垂直偏移参数
|
||||
child: Transform.scale(
|
||||
scale: 0.9,
|
||||
child: Image.asset(
|
||||
imagePath,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text('地图'),
|
||||
backgroundColor: Colors.green,
|
||||
),
|
||||
body: SingleChildScrollView(
|
||||
child: Column(
|
||||
children: [
|
||||
_buildImage('assets/1F.png', 200, 10), // 自定义图片路径、高度和垂直偏移
|
||||
_buildImage('assets/2F.png', 200, 15),
|
||||
_buildImage('assets/3F.png', 200, 15),
|
||||
_buildImage('assets/4F.png', 200, 15),
|
||||
_buildImage('assets/5F.png', 200, 15),
|
||||
SizedBox(height: 100), // 添加一个底部填充
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|