Compare commits

...

3 Commits

Author SHA1 Message Date
嘉辉 JIA HUI 94235702ee Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into HanJiaHui_Branch
2 years ago
嘉辉 JIA HUI 6c45713c00 Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into HanJiaHui_Branch
2 years ago
嘉辉 JIA HUI 73d714bf3b 1
2 years ago

@ -99,13 +99,21 @@
}, },
{ {
"name": "sqflite", "name": "sqflite",
<<<<<<< HEAD
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0", "rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "3.0" "languageVersion": "3.0"
}, },
{ {
"name": "sqflite_common", "name": "sqflite_common",
<<<<<<< HEAD
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0",
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0", "rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0",
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "3.0" "languageVersion": "3.0"
}, },
@ -127,12 +135,6 @@
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "2.18" "languageVersion": "2.18"
}, },
{
"name": "synchronized",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{ {
"name": "term_glyph", "name": "term_glyph",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1", "rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
@ -164,7 +166,15 @@
"languageVersion": "3.1" "languageVersion": "3.1"
} }
], ],
<<<<<<< HEAD
<<<<<<< HEAD
"generated": "2023-10-18T00:09:25.397919Z",
=======
"generated": "2023-10-17T16:33:26.011261Z",
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
=======
"generated": "2023-10-18T00:10:28.185657Z", "generated": "2023-10-18T00:10:28.185657Z",
>>>>>>> f53c837e0b781167ecb3acbfd215539afb64f42e
"generator": "pub", "generator": "pub",
"generatorVersion": "3.1.1" "generatorVersion": "3.1.1"
} }

@ -16,8 +16,13 @@ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib/
collection collection
2.18 2.18
<<<<<<< HEAD
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib/
=======
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib/
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
fake_async fake_async
2.12 2.12
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/
@ -48,6 +53,18 @@ 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/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib/
source_span source_span
2.18 2.18
<<<<<<< HEAD
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/
sqflite
3.0
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib/
sqflite_common
3.0
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib/
=======
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/
sqflite sqflite
@ -58,6 +75,7 @@ sqflite_common
3.0 3.0
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib/
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
stack_trace stack_trace
2.18 2.18
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/
@ -68,12 +86,21 @@ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/
string_scanner string_scanner
2.18 2.18
<<<<<<< HEAD
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/
synchronized
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib/
=======
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/
synchronized synchronized
2.18 2.18
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib/
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
term_glyph term_glyph
2.12 2.12
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/ file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/

@ -1,2 +1,6 @@
# This is a generated file; do not edit or check into version control. # 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\\ sqflite=C:\\Users\\17651\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4

@ -1 +1,9 @@
{"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-18 08:10:28.388141","version":"3.13.3"} <<<<<<< HEAD
<<<<<<< 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-18 08:09:25.525794","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-18 00:33:26.204626","version":"3.13.3"}
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
=======
{"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-18 08:10:28.388141","version":"3.13.3"}
>>>>>>> f53c837e0b781167ecb3acbfd215539afb64f42e

@ -1,27 +1,27 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="Dart SDK"> <library name="Dart SDK">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/async" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/async" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/cli" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/cli" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/collection" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/collection" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/convert" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/convert" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/core" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/core" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/developer" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/developer" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/ffi" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/ffi" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/html" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/html" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/indexed_db" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/indexed_db" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/io" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/io" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/isolate" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/isolate" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/js" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js_interop" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/js_interop" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js_interop_unsafe" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/js_interop_unsafe" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js_util" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/js_util" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/math" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/math" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/mirrors" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/mirrors" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/svg" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/svg" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/typed_data" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/typed_data" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/web_audio" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/web_audio" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/web_gl" /> <root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/web_gl" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="Flutter Plugins" type="FlutterPluginsLibraryType">
<CLASSES>
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

@ -26,6 +26,5 @@
<orderEntry type="library" name="Flutter for Android" level="project" /> <orderEntry type="library" name="Flutter for Android" level="project" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" /> <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="Dart SDK" level="project" /> <orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
</component> </component>
</module> </module>

@ -2,9 +2,16 @@ import 'package:flutter/material.dart';
import 'CollectionListPage.dart'; import 'CollectionListPage.dart';
import 'MapPage.dart'; import 'MapPage.dart';
import 'MuseumInfoExtendPage.dart'; import 'MuseumInfoExtendPage.dart';
<<<<<<< HEAD
import 'ServicePage.dart';
import 'LoginPage.dart';
=======
import 'LoginPage.dart'; import 'LoginPage.dart';
import 'ServicePage.dart'; import 'ServicePage.dart';
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
void main() { void main() {
runApp(MaterialApp( runApp(MaterialApp(
home: MuseumInfoPage(), home: MuseumInfoPage(),

@ -5,7 +5,7 @@ description: A new Flutter project.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# The following defines the version and build number for your application. # The following defines the version and build number for your application.
version: 1.0.0+1 version: 1.0.0
environment: environment:
sdk: '>=3.1.1 <4.0.0' sdk: '>=3.1.1 <4.0.0'
@ -17,9 +17,13 @@ dependencies:
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter

@ -10,6 +10,5 @@
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Dart SDK" level="project" /> <orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Flutter Plugins" level="project" /> <orderEntry type="library" name="Flutter Plugins" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
</component> </component>
</module> </module>
Loading…
Cancel
Save