代码

src/.dart_tool/flutter_build/99d422f60ec3de076ff7e456d1ef6bf5/outputs.json

@@ -1 +1 @@
-["D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/1F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/2F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/3F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/4F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/5F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection0.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection2.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection3.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection4.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
+["D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/1F-Route.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/1F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/2F-Route.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/2F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/3F-Route.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/3F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/4F-Route.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/4F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/5F-Route.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/5F.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection0-1.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection0-2.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1-1.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1-2.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1-3.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1-4.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview1.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview2.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview3.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]

src/.dart_tool/package_config.json

@@ -87,7 +87,7 @@
     },
     {
       "name": "photo_view",
-      "rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0",
+      "rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0",
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
@@ -170,11 +170,7 @@
       "languageVersion": "3.1"
     }
   ],
-<<<<<<< HEAD
-  "generated": "2023-10-31T09:11:55.904063Z",
-=======
-  "generated": "2023-11-01T12:17:02.466495Z",
->>>>>>> ad4f76f0b56603d1cd77f408db73c70e3c2c2ef0
+  "generated": "2023-11-10T13:11:45.198898Z",
   "generator": "pub",
   "generatorVersion": "3.1.1"
 }

src/.dart_tool/package_config_subset

@@ -44,17 +44,12 @@ file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.
 file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/lib/
 path
 2.12
-<<<<<<< HEAD
 file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/
 file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib/
-=======
-file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/
-file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib/
 photo_view
 2.12
-file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0/
-file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0/lib/
->>>>>>> ad4f76f0b56603d1cd77f408db73c70e3c2c2ef0
+file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0/
+file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/photo_view-0.14.0/lib/
 source_span
 2.18
 file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/

src/.flutter-plugins-dependencies

@@ -1,5 +1 @@
-<<<<<<< HEAD
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\康江龙\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\康江龙\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\康江龙\\\\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 17:21:27.663109","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-11-10 20:11:18.083982","version":"3.13.3"}
->>>>>>> ad4f76f0b56603d1cd77f408db73c70e3c2c2ef0
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\康江龙\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\康江龙\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\康江龙\\\\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 21:14:41.622926","version":"3.13.3"}

src/.idea/dataSources.local.xml

@@ -1,12 +1,7 @@
 <?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="a84e8ed8-57ec-4250-8841-7f4c909379d5">
-      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="SQLITE" exact-version="0" />
-      <schema-mapping />
-=======
-    <data-source name="travelguide" uuid="e282f56a-94d6-49a3-a567-05358c5c2a23">
+    <data-source name="travelguide" uuid="1aeb51e5-bcce-426e-8d4e-9702ad17a84b">
       <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>
@@ -14,10 +9,9 @@
       <auth-provider>no-auth</auth-provider>
       <schema-mapping>
         <introspection-scope>
-          <node kind="schema" negative="1" />
+          <node kind="schema" qname="@" />
         </introspection-scope>
       </schema-mapping>
->>>>>>> ad4f76f0b56603d1cd77f408db73c70e3c2c2ef0
     </data-source>
   </component>
 </project>

src/.idea/dataSources.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="travelguide" uuid="e282f56a-94d6-49a3-a567-05358c5c2a23">
+    <data-source source="LOCAL" name="travelguide" uuid="1aeb51e5-bcce-426e-8d4e-9702ad17a84b">
       <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>
+      <jdbc-url>jdbc:sqlite:C:\Users\康江龙\Documents\AndroidStudio\DeviceExplorer\Pixel_3_XL_API_30 [emulator-5554]\data\user\0\com.example.travelguide\databases\travelguide.db</jdbc-url>
       <working-dir>$ProjectFileDir$</working-dir>
       <libraries>
         <library>

src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-#Tue Oct 31 17:23:37 CST 2023
+#Fri Nov 10 21:15:13 CST 2023
 base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
-=======
-#Fri Nov 10 19:35:01 CST 2023
-base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
->>>>>>> ad4f76f0b56603d1cd77f408db73c70e3c2c2ef0
 renamed.0=classes.dex
 path.0=classes.dex

src/build/app/outputs/flutter-apk/app-debug.apk.sha1

@@ -1,5 +1 @@
-<<<<<<< HEAD
-6387054b45c327f2514e83376e6348715719958b
-=======
-aae569355e956eb504114509b10ba471c0bec8ce
->>>>>>> ad4f76f0b56603d1cd77f408db73c70e3c2c2ef0
+44d4d069720a83b599686cfa2bb1ced9800319db