diff --git a/src/.dart_tool/package_config.json b/src/.dart_tool/package_config.json index 48146306..f49d1548 100644 --- a/src/.dart_tool/package_config.json +++ b/src/.dart_tool/package_config.json @@ -164,23 +164,7 @@ "languageVersion": "3.1" } ], -<<<<<<< HEAD - "generated": "2023-10-24T12:01:20.923476Z", -======= -<<<<<<< HEAD -<<<<<<< HEAD - "generated": "2023-10-16T01:46:48.339173Z", -======= -<<<<<<< HEAD - "generated": "2023-10-16T01:37:37.659867Z", -======= - "generated": "2023-10-14T16:04:33.747467Z", ->>>>>>> 99f10a789f1d8550634d678f64e6e5e48b4a346d ->>>>>>> 76a87407b46a1483a7bab52f8315f6937e30bc7f -======= - "generated": "2023-10-16T02:07:01.224187Z", ->>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc ->>>>>>> de423840f81ecfe8842e778255c7b2d277887a46 + "generated": "2023-10-31T03:02:37.119553Z", "generator": "pub", "generatorVersion": "3.1.1" } diff --git a/src/.flutter-plugins-dependencies b/src/.flutter-plugins-dependencies index 953a848f..5218fb65 100644 --- a/src/.flutter-plugins-dependencies +++ b/src/.flutter-plugins-dependencies @@ -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 09:57:27.087857","version":"3.13.3"} \ No newline at end of file +{"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"} \ No newline at end of file diff --git a/src/android/travelguide_android.iml b/src/android/travelguide_android.iml index fe0081e9..7f180150 100644 --- a/src/android/travelguide_android.iml +++ b/src/android/travelguide_android.iml @@ -26,7 +26,6 @@ - @@ -36,5 +35,6 @@ + \ No newline at end of file diff --git a/src/lib/travelguideapp/ui/boundary/MapPage.dart b/src/lib/travelguideapp/ui/boundary/MapPage.dart index c16cde1c..55c201a2 100644 --- a/src/lib/travelguideapp/ui/boundary/MapPage.dart +++ b/src/lib/travelguideapp/ui/boundary/MapPage.dart @@ -8,7 +8,7 @@ class MapPage extends StatefulWidget { } class _MapPageState extends State { - int currentFloor = 1; + int currentFloor = 0; final List floorImages = [ 'assets/1F.png', 'assets/2F.png', @@ -25,17 +25,23 @@ class _MapPageState extends State { } } + void previousFloor() { + if (currentFloor > 0) { + setState(() { + currentFloor--; + }); + } + } + Widget _buildImage(String imagePath, double height, double verticalOffset) { - return Center( // 将图片居中 + return Center( child: SizedBox( - height: height, // 使用传递的高度参数 + height: height, child: Transform.translate( - offset: Offset(0, verticalOffset), // 使用传递的垂直偏移参数 + offset: Offset(0, verticalOffset), child: Transform.scale( - scale: 0.9, - child: Image.asset( - imagePath, - ), + scale: 0.95, + child: Image.asset(imagePath), ), ), ), @@ -46,18 +52,42 @@ class _MapPageState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: Text('地图 - Floor ${currentFloor + 1}'), + title: Text('地图 - ${currentFloor + 1} 楼'), backgroundColor: Colors.green, ), body: Column( + mainAxisAlignment: MainAxisAlignment.center, // 垂直方向上居中对齐 children: [ _buildImage(floorImages[currentFloor], 200, 10), - ElevatedButton( - onPressed: nextFloor, - child: Text('切换到下一楼层'), + Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + ElevatedButton( + style: ElevatedButton.styleFrom( + backgroundColor: Colors.green, + padding: EdgeInsets.all(16), + ), + onPressed: previousFloor, + child: Text( + '切换到上一楼层', + style: TextStyle(fontSize: 16), + ), + ), + ElevatedButton( + style: ElevatedButton.styleFrom( + backgroundColor: Colors.green, + padding: EdgeInsets.all(16), + ), + onPressed: nextFloor, + child: Text( + '切换到下一楼层', + style: TextStyle(fontSize: 16), + ), + ), + ], ), ], ), ); } -} +} \ No newline at end of file