YuYouShui_Branch
黎超凡 2 years ago
parent 0d2334a5c6
commit 747b8f98a2

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

@ -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/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\\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_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"]

@ -1 +1 @@
{"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-31 11:02:37.264592","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-31 18:20:32.895598","version":"3.13.3"}

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="dataSourceStorageLocal" created-in="IU-211.7628.21"> <component name="dataSourceStorageLocal" created-in="IU-211.7628.21">
<data-source name="travelguide" uuid="b0363c3a-7ffd-47d0-b686-86b59585a7f7"> <data-source name="travelguide" uuid="a84e8ed8-57ec-4250-8841-7f4c909379d5">
<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"> <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> <identifier-quote-string>&quot;</identifier-quote-string>
</database-info> </database-info>

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

@ -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 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.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_Preview1.jpg  assetassets/Museum_Preview1.jpgassets/Museum_Preview2.jpg  assetassets/Museum_Preview2.jpgassets/Museum_Preview3.jpg  assetassets/Museum_Preview3.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

@ -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.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_Preview1.jpg":["assets/Museum_Preview1.jpg"],"assets/Museum_Preview2.jpg":["assets/Museum_Preview2.jpg"],"assets/Museum_Preview3.jpg":["assets/Museum_Preview3.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"]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 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 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.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_Preview1.jpg  assetassets/Museum_Preview1.jpgassets/Museum_Preview2.jpg  assetassets/Museum_Preview2.jpgassets/Museum_Preview3.jpg  assetassets/Museum_Preview3.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

@ -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.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_Preview1.jpg":["assets/Museum_Preview1.jpg"],"assets/Museum_Preview2.jpg":["assets/Museum_Preview2.jpg"],"assets/Museum_Preview3.jpg":["assets/Museum_Preview3.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"]}

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

File diff suppressed because one or more lines are too long

@ -1,4 +1,4 @@
#Tue Oct 31 09:57:35 CST 2023 #Tue Oct 31 18:21:21 CST 2023
base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex renamed.0=classes.dex
path.0=classes.dex path.0=classes.dex

@ -1 +1 @@
238bffc8581a468489aaa9de6e605d2f1e9821e5 75975cee94059c2d7b7eccc714e4d060f6429f43

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'CollectionListPage.dart'; import 'CollectionListPage.dart';
import 'MuseumInfoExtendPage.dart'; import 'MuseumInfoExtendPage.dart';
import 'LoginPage.dart'; import 'LoginPage.dart';
import 'dart:async';
void main() { void main() {
runApp(MaterialApp( runApp(MaterialApp(
@ -23,9 +24,8 @@ class _MuseumInfoPageState extends State<MuseumInfoPage> {
backgroundColor: Colors.green, backgroundColor: Colors.green,
actions: [ actions: [
IconButton( IconButton(
icon: Icon(Icons.account_circle_outlined), // 使 icon: Icon(Icons.account_circle_outlined),
onPressed: () { onPressed: () {
//
Navigator.of(context).push( Navigator.of(context).push(
MaterialPageRoute( MaterialPageRoute(
builder: (context) => LoginPage(), builder: (context) => LoginPage(),
@ -36,69 +36,126 @@ class _MuseumInfoPageState extends State<MuseumInfoPage> {
], ],
), ),
backgroundColor: Colors.white, backgroundColor: Colors.white,
body: Column( body: Padding(
children: [ padding: const EdgeInsets.only(top: 15),
_buildImage('assets/Museum_Preview.jpg', 220, 10), child: Column(
_buildCustomButton('查看博物馆信息', 45, 10, () { children: [
Navigator.of(context).push( //
MaterialPageRoute( AutoImageSlider(),
builder: (context) => MuseumInfoExtendPage(), _buildCustomButton('查看博物馆信息', 45, 10, () {
), Navigator.of(context).push(
); MaterialPageRoute(
}), builder: (context) => MuseumInfoExtendPage(),
_buildCustomButton('查看馆藏信息', 45, 20, () { ),
Navigator.of(context).push( );
MaterialPageRoute( }),
builder: (context) => CollectionListPage(), _buildCustomButton('查看馆藏信息', 45, 20, () {
), Navigator.of(context).push(
); MaterialPageRoute(
}), builder: (context) => CollectionListPage(),
], ),
);
}),
],
),
), ),
); );
} }
} }
// //
Widget _buildImage(String imagePath, double height, double verticalOffset) { class AutoImageSlider extends StatefulWidget {
return Center( // @override
child: SizedBox( _AutoImageSliderState createState() => _AutoImageSliderState();
height: height, // 使 }
child: Transform.translate(
offset: Offset(0, verticalOffset), // 使 class _AutoImageSliderState extends State<AutoImageSlider> {
child: Transform.scale( PageController _pageController = PageController(initialPage: 0);
scale: 0.9, int _currentPage = 0;
child: Image.asset( final List<String> _imageUrls = [
imagePath, 'assets/Museum_Preview1.jpg',
), 'assets/Museum_Preview2.jpg',
), 'assets/Museum_Preview3.jpg',
];
Timer? _timer;
@override
void initState() {
super.initState();
_startAutoPlay();
}
@override
void dispose() {
_stopAutoPlay();
_pageController.dispose();
super.dispose();
}
void _startAutoPlay() {
_timer = Timer.periodic(Duration(seconds: 3), (timer) {
if (_currentPage < _imageUrls.length - 1) {
_currentPage++;
} else {
_currentPage = 0;
}
_pageController.animateToPage(_currentPage,
duration: const Duration(milliseconds: 500), curve: Curves.easeOut);
});
}
void _stopAutoPlay() {
if (_timer != null) {
_timer!.cancel();
}
}
@override
Widget build(BuildContext context) {
return Container(
height: 200,
child: PageView.builder(
controller: _pageController,
itemCount: _imageUrls.length,
itemBuilder: (context, index) {
return Image.asset(
_imageUrls[index],
fit: BoxFit.cover,
);
},
onPageChanged: (index) {
setState(() {
_currentPage = index;
});
},
), ),
), );
); }
} }
//
Widget _buildCustomButton(String buttonText, double height, double verticalOffset, void Function() onPressed) { Widget _buildCustomButton(String buttonText, double height, double verticalOffset, void Function() onPressed) {
return SizedBox( return SizedBox(
height: height, // height: height,
child: Transform.translate( child: Transform.translate(
offset: Offset(0, verticalOffset), // offset: Offset(0, verticalOffset),
child: ElevatedButton( child: ElevatedButton(
onPressed: onPressed, // onPressed: onPressed,
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: Colors.green, // 绿 backgroundColor: Colors.green,
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 12, horizontal: 12,
vertical: 10, vertical: 10,
), ),
), ),
child: Text( child: Text(
buttonText, // buttonText,
style: TextStyle( style: TextStyle(
color: Colors.white, // color: Colors.white,
fontSize: 18, // 18 fontSize: 18,
), ),
), ),
), ),
), ),
); );
} }

@ -105,7 +105,7 @@ class Service1 extends StatelessWidget {
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20), padding: const EdgeInsets.symmetric(horizontal: 20),
child: Text( child: Text(
'01.\n' '1.\n'
'天津博物馆向社会公众免费开放,观众可在网上提前七日预约门票。预约成功后,可凭预约码及' '天津博物馆向社会公众免费开放,观众可在网上提前七日预约门票。预约成功后,可凭预约码及'
'有效证件,包括本人二代身份证、港澳台居民居住证、天津市第三代社保卡原件刷证入馆。\n' '有效证件,包括本人二代身份证、港澳台居民居住证、天津市第三代社保卡原件刷证入馆。\n'
'\n' '\n'

Loading…
Cancel
Save