嘉辉 JIA HUI 2 years ago
commit 18987688a1

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +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/1F-Route.png","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-Route.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-Route.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-Route.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-Route.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-1.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection0-2.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1-1.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1-2.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1-3.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1-4.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview1.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview2.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview3.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\\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"]

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\bfc3acc656e13e8ff13c9c6038884f65\\armeabi-v7a\\app.so"],"outputs":["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\armeabi-v7a\\app.so"]}

@ -0,0 +1 @@
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\bfc3acc656e13e8ff13c9c6038884f65\\arm64-v8a\\app.so"],"outputs":["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\arm64-v8a\\app.so"]}

@ -0,0 +1 @@
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\bfc3acc656e13e8ff13c9c6038884f65\\x86_64\\app.so"],"outputs":["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\x86_64\\app.so"]}

@ -0,0 +1 @@
{"inputs":["E:\\flutter\\packages\\flutter_tools\\lib\\src\\build_system\\targets\\android.dart","E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\bfc3acc656e13e8ff13c9c6038884f65\\app.dill","E:\\flutter\\bin\\internal\\engine.version","E:\\flutter\\bin\\internal\\engine.version","E:\\flutter\\bin\\internal\\engine.version"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\bfc3acc656e13e8ff13c9c6038884f65\\armeabi-v7a\\app.so"]}

@ -0,0 +1 @@
{"inputs":["E:\\flutter\\packages\\flutter_tools\\lib\\src\\build_system\\targets\\android.dart","E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\bfc3acc656e13e8ff13c9c6038884f65\\app.dill","E:\\flutter\\bin\\internal\\engine.version","E:\\flutter\\bin\\internal\\engine.version","E:\\flutter\\bin\\internal\\engine.version"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\bfc3acc656e13e8ff13c9c6038884f65\\arm64-v8a\\app.so"]}

@ -0,0 +1 @@
{"inputs":["E:\\flutter\\packages\\flutter_tools\\lib\\src\\build_system\\targets\\android.dart","E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\bfc3acc656e13e8ff13c9c6038884f65\\app.dill","E:\\flutter\\bin\\internal\\engine.version","E:\\flutter\\bin\\internal\\engine.version","E:\\flutter\\bin\\internal\\engine.version"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\bfc3acc656e13e8ff13c9c6038884f65\\x86_64\\app.so"]}

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
{"inputs":["E:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["E:\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/1F-Route.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/1F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/2F-Route.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/2F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/3F-Route.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/3F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/4F-Route.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/4F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/5F-Route.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/5F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/collection0-1.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/collection0-2.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/collection1-1.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/collection1-2.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/collection1-3.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/collection1-4.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/Museum_Preview1.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/Museum_Preview2.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/Museum_Preview3.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/service1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\assets/service2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\fonts/MaterialIcons-Regular.otf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\shaders/ink_sparkle.frag","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\AssetManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\AssetManifest.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\FontManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\flutter_assets\\NOTICES.Z","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\armeabi-v7a\\app.so","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\arm64-v8a\\app.so","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\release\\x86_64\\app.so"]

@ -85,6 +85,12 @@
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "photo_view",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "sky_engine",
"rootUri": "file:///D:/flutter_windows_3.13.3-stable/flutter/bin/cache/pkg/sky_engine",
@ -164,7 +170,7 @@
"languageVersion": "3.1"
}
],
"generated": "2023-10-18T00:37:19.370188Z",
"generated": "2023-11-10T12:46:27.794802Z",
"generator": "pub",
"generatorVersion": "3.1.1"
}

@ -46,6 +46,10 @@ path
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib/
photo_view
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0/lib/
source_span
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/

@ -1 +1 @@
{"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-31 16:32:59.585815","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\\\\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-11-10 20:46:27.876853","version":"3.13.3"}

@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="dataSourceStorageLocal" created-in="IU-211.7628.21">
<<<<<<< HEAD
<data-source name="travelguide" uuid="93a801bc-5718-4fc3-8537-9e41e9812f75">
=======
<data-source name="travelguide" uuid="e282f56a-94d6-49a3-a567-05358c5c2a23">
>>>>>>> 972446da173e125fb36eecd6f3f6618a2f53b403
<database-info product="SQLite" version="3.43.0" jdbc-version="4.2" driver-name="SQLite JDBC" driver-version="3.43.0.0" dbms="SQLITE" exact-version="3.43.0" exact-driver-version="3.43">
<identifier-quote-string>&quot;</identifier-quote-string>
</database-info>
@ -9,7 +13,11 @@
<auth-provider>no-auth</auth-provider>
<schema-mapping>
<introspection-scope>
<<<<<<< HEAD
<node kind="schema" qname="@" />
=======
<node kind="schema" negative="1" />
>>>>>>> 972446da173e125fb36eecd6f3f6618a2f53b403
</introspection-scope>
</schema-mapping>
</data-source>

@ -1,19 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<<<<<<< HEAD
<data-source source="LOCAL" name="travelguide" uuid="93a801bc-5718-4fc3-8537-9e41e9812f75">
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:C:\Users\86131\Documents\AndroidStudio\DeviceExplorer\Pixel_3_XL_API_30 [emulator-5554]\data\user\0\com.example.travelguide\databases\travelguide.db</jdbc-url>
=======
<data-source source="LOCAL" name="travelguide" uuid="e282f56a-94d6-49a3-a567-05358c5c2a23">
<driver-ref>sqlite.xerial</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.sqlite.JDBC</jdbc-driver>
<jdbc-url>jdbc:sqlite:C:\Users\17651\Documents\AndroidStudio\DeviceExplorer\Pixel_3_XL_API_30 [emulator-5554]\data\user\0\com.example.travelguide\databases\travelguide.db</jdbc-url>
>>>>>>> 972446da173e125fb36eecd6f3f6618a2f53b403
<working-dir>$ProjectFileDir$</working-dir>
<libraries>
<library>
<url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.43.0/org/xerial/sqlite-jdbc/3.43.0.0/sqlite-jdbc-3.43.0.0.jar</url>
</library>
<<<<<<< HEAD
<library>
<url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.43.0/org/xerial/sqlite-jdbc/3.43.0.0/sqlite-jdbc-3.43.0.0.jar</url>
</library>
=======
>>>>>>> 972446da173e125fb36eecd6f3f6618a2f53b403
</libraries>
</data-source>
</component>

@ -100,6 +100,13 @@
</list>
</value>
</entry>
<entry key="photo_view">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0/lib" />
</list>
</value>
</entry>
<entry key="sky_engine">
<value>
<list>
@ -199,6 +206,7 @@
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib" />

@ -1,6 +0,0 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter">
<option name="filePath" value="$PROJECT_DIR$/lib/main.dart" />
<method />
</configuration>
</component>

Binary file not shown.

@ -1,3 +0,0 @@
# Default ignored files
/shelf/
/workspace.xml

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" />
</component>
</project>

@ -1,12 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT">
<builds>
<build path="$PROJECT_DIR$/../../../flutter/packages/flutter_tools/gradle" name="gradle">
<projects>
<project path="$PROJECT_DIR$/../../../flutter/packages/flutter_tools/gradle" />
</projects>
</build>
</builds>
</compositeBuild>
</compositeConfiguration>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/android" />
<option value="$PROJECT_DIR$/../../../flutter/packages/flutter_tools/gradle" />
<option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" />
</set>
</option>
</GradleProjectSettings>
</option>
</component>

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="MavenRepo" />
<option name="name" value="MavenRepo" />
<option name="url" value="https://repo.maven.apache.org/maven2/" />
</remote-repository>
<remote-repository>
<option name="id" value="maven" />
<option name="name" value="maven" />
<option name="url" value="https://storage.googleapis.com/download.flutter.io" />
</remote-repository>
<remote-repository>
<option name="id" value="Google2" />
<option name="name" value="Google2" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
</component>
</project>

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
</component>
</project>

@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="NONE" />
</component>
<component name="ChangeListManager">
<list default="true" id="d7b6f9d0-c8b9-4358-b0ee-5bcdaa4f541b" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/../.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/.filecache" beforeDir="false" afterPath="$PROJECT_DIR$/../.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/.filecache" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/app.dill" beforeDir="false" afterPath="$PROJECT_DIR$/../.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/app.dill" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/debug_android_application.stamp" beforeDir="false" afterPath="$PROJECT_DIR$/../.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/debug_android_application.stamp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/flutter_assets.d" beforeDir="false" afterPath="$PROJECT_DIR$/../.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/flutter_assets.d" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../.flutter-plugins-dependencies" beforeDir="false" afterPath="$PROJECT_DIR$/../.flutter-plugins-dependencies" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin" beforeDir="false" afterPath="$PROJECT_DIR$/../build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar" beforeDir="false" afterPath="$PROJECT_DIR$/../build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin" beforeDir="false" afterPath="$PROJECT_DIR$/../build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../build/app/intermediates/flutter/debug/flutter_build.d" beforeDir="false" afterPath="$PROJECT_DIR$/../build/app/intermediates/flutter/debug/flutter_build.d" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/../build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../build/app/outputs/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/../build/app/outputs/apk/debug/app-debug.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../build/app/outputs/flutter-apk/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/../build/app/outputs/flutter-apk/app-debug.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../build/app/outputs/flutter-apk/app-debug.apk.sha1" beforeDir="false" afterPath="$PROJECT_DIR$/../build/app/outputs/flutter-apk/app-debug.apk.sha1" afterDir="false" />
<change beforePath="$PROJECT_DIR$/../build/fa1f46848d15fd18dc4e2938a3aa6cef.cache.dill.track.dill" beforeDir="false" afterPath="$PROJECT_DIR$/../build/fa1f46848d15fd18dc4e2938a3aa6cef.cache.dill.track.dill" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[E:\AndroidTool\AndroidSDK\.android\avd\Pixel_3_XL_API_30.avd]" />
<component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$">
<ProjectState />
</projectState>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/../.." />
</component>
<component name="ProjectId" id="2Xz0KZNzuFkaq4SoHK5TiPe0tmP" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.cidr.known.project.marker": "true",
"cidr.known.project.marker": "true",
"dart.analysis.tool.window.visible": "false",
"memory.settings.postsync.last.time.stamp": "1699616687532",
"show.migrate.to.gradle.popup": "false"
}
}]]></component>
<component name="RunManager">
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
<module name="android.app.main" />
<option name="DEPLOY" value="true" />
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
<option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="ALL_USERS" value="false" />
<option name="ALWAYS_INSTALL_WITH_PM" value="false" />
<option name="CLEAR_APP_STORAGE" value="false" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="false" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
<option name="DEBUGGER_TYPE" value="Auto" />
<Auto>
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
<option name="SHOW_STATIC_VARS" value="true" />
<option name="WORKING_DIR" value="" />
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Auto>
<Hybrid>
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
<option name="SHOW_STATIC_VARS" value="true" />
<option name="WORKING_DIR" value="" />
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Hybrid>
<Java />
<Native>
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
<option name="SHOW_STATIC_VARS" value="true" />
<option name="WORKING_DIR" value="" />
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Native>
<Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
</Profilers>
<option name="DEEP_LINK" value="" />
<option name="ACTIVITY_CLASS" value="" />
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />
<method v="2">
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
</method>
</configuration>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="d7b6f9d0-c8b9-4358-b0ee-5bcdaa4f541b" name="Changes" comment="" />
<created>1699616538232</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1699616538232</updated>
</task>
<servers />
</component>
</project>

@ -51,11 +51,21 @@ android {
versionName flutterVersionName
}
signingConfigs {
release {
keyAlias 'key'
keyPassword '123456'
storeFile file('D:/key.jks')
storePassword '123456'
}
}
buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
//signingConfig signingConfigs.debug
signingConfig signingConfigs.release
}
}
}
@ -65,3 +75,4 @@ flutter {
}
dependencies {}

@ -24,8 +24,23 @@
<orderEntry type="jdk" jdkName="Android API 33 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Flutter for Android" level="project" />
<orderEntry type="library" exported="" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" exported="" name="Dart SDK" level="project" />
<orderEntry type="library" exported="" name="Dart Packages" level="project" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.43.0/org/xerial/sqlite-jdbc/3.43.0.0/sqlite-jdbc-3.43.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="library" name="Dart Packages" level="project" />
</component>
</module>

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 KiB

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 KiB

After

Width:  |  Height:  |  Size: 127 KiB

Before

Width:  |  Height:  |  Size: 355 KiB

After

Width:  |  Height:  |  Size: 355 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Before

Width:  |  Height:  |  Size: 211 KiB

After

Width:  |  Height:  |  Size: 211 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 504 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

@ -1 +1 @@
 assets/1F.png  asset assets/1F.png assets/2F.png  asset assets/2F.png assets/3F.png  asset assets/3F.png assets/4F.png  asset    asset  assets/1F.png   asset  assets/1F.png  assets/2F.png   assets/2F.png  assets/3F.png   assets/3F.png  assets/4F.png  gassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png
assets/1F-Route.png  assets/1F.png   assets/1F.png  asset assets/1F.pngassets/2F-Route.png  assetassets/2F-Route.png assets/2F.png  asset assets/1F.png  assets/1F.png assets/1F.png  assets/2F.png  assets/3F.png  asset assets/1F.png  assets/2F.png assets/1F.png  assets/3F.png  assets/4F.png  asset assets/1F.png  assets/3F.png assets/1F.png  assets/4F.png  assets/5F.png  asset asset asset  asset assets/1F.png  asset asset asset assets/1F.png asset assets/2F.png  asset assets/2F.png asset assets/3F.png  asset assets/3F.png asset assets/4F.png  gassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png

@ -1 +1 @@
{"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"]}
{"assets/1F-Route.png":["assets/1F-Route.png"],"assets/1F.png":["assets/1F.png"],"assets/2F-Route.png":["assets/2F-Route.png"],"assets/2F.png":["assets/2F.png"],"assets/3F-Route.png":["assets/3F-Route.png"],"assets/3F.png":["assets/3F.png"],"assets/4F-Route.png":["assets/4F-Route.png"],"assets/4F.png":["assets/4F.png"],"assets/5F-Route.png":["assets/5F-Route.png"],"assets/5F.png":["assets/5F.png"],"assets/Museum_Preview1.jpg":["assets/Museum_Preview1.jpg"],"assets/Museum_Preview2.jpg":["assets/Museum_Preview2.jpg"],"assets/Museum_Preview3.jpg":["assets/Museum_Preview3.jpg"],"assets/collection0-1.jpg":["assets/collection0-1.jpg"],"assets/collection0-2.jpg":["assets/collection0-2.jpg"],"assets/collection1-1.jpg":["assets/collection1-1.jpg"],"assets/collection1-2.jpg":["assets/collection1-2.jpg"],"assets/collection1-3.jpg":["assets/collection1-3.jpg"],"assets/collection1-4.jpg":["assets/collection1-4.jpg"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 113 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 KiB

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 KiB

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 184 KiB

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 KiB

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 504 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

@ -1 +1,5 @@
<<<<<<< HEAD
 assets/1F.png  asset assets/1F.png assets/2F.png  asset assets/2F.png assets/3F.png  asset assets/3F.png assets/4F.png  asset assets/4F.png assets/5F.png  asset assets/5F.pngassets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  assetassets/Museum_Preview.jpgassets/collection0.png  assetassets/collection0.pngassets/collection1.png  assetassets/collection1.pngassets/collection2.png  assetassets/collection2.pngassets/collection3.png  assetassets/collection3.pngassets/collection4.png  assetassets/collection4.pngassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png
=======
assets/1F-Route.png  assetassets/1F-Route.png assets/1F.png  asset assets/1F.pngassets/2F-Route.png  assetassets/2F-Route.png assets/2F.png  asset assets/2F.pngassets/3F-Route.png  assetassets/3F-Route.png assets/3F.png  asset assets/3F.pngassets/4F-Route.png  assetassets/4F-Route.png assets/4F.png  asset assets/4F.pngassets/5F-Route.png  assetassets/5F-Route.png assets/5F.png  asset assets/5F.pngassets/Museum_Preview1.jpg  assetassets/Museum_Preview1.jpgassets/Museum_Preview2.jpg  assetassets/Museum_Preview2.jpgassets/Museum_Preview3.jpg  assetassets/Museum_Preview3.jpgassets/collection0-1.jpg  assetassets/collection0-1.jpgassets/collection0-2.jpg  assetassets/collection0-2.jpgassets/collection1-1.jpg  assetassets/collection1-1.jpgassets/collection1-2.jpg  assetassets/collection1-2.jpgassets/collection1-3.jpg  assetassets/collection1-3.jpgassets/collection1-4.jpg  assetassets/collection1-4.jpgassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png
>>>>>>> 972446da173e125fb36eecd6f3f6618a2f53b403

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save