From b025ba05b1eda4102b61c29fa28b3a443defe5e1 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Thu, 26 Feb 2026 10:44:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widgets/BottomDirectionLine.dart | 8 +- .../widgets/map/testmap_pages.dart | 426 +++++++++++++++++- .../presentation/widgets/path_list_pages.dart | 17 +- .../presentation/widgets/startpoint_area.dart | 12 +- 4 files changed, 442 insertions(+), 21 deletions(-) diff --git a/lib/features/home/presentation/widgets/BottomDirectionLine.dart b/lib/features/home/presentation/widgets/BottomDirectionLine.dart index 85c6ee82..a70c33d7 100644 --- a/lib/features/home/presentation/widgets/BottomDirectionLine.dart +++ b/lib/features/home/presentation/widgets/BottomDirectionLine.dart @@ -73,7 +73,7 @@ class _RouteDirectionPanelState extends State { const SizedBox(width: 24), // 占位保持标题居中 ], ), - const SizedBox(height: 20), + const SizedBox(height: 10), //const Divider(height: 1, color: Colors.grey), //const SizedBox(height: 20), @@ -96,7 +96,7 @@ class _RouteDirectionPanelState extends State { ), ], ), - const SizedBox(height: 30), + const SizedBox(height: 10), // 航线方向滑块 Column( @@ -119,7 +119,7 @@ class _RouteDirectionPanelState extends State { ), ], ), - const SizedBox(height: 15), + const SizedBox(height: 10), Slider( value: _direction, min: 0, @@ -138,7 +138,7 @@ class _RouteDirectionPanelState extends State { ), ], ), - const SizedBox(height: 40), + const SizedBox(height: 10), // 确认按钮 SizedBox( diff --git a/lib/features/home/presentation/widgets/map/testmap_pages.dart b/lib/features/home/presentation/widgets/map/testmap_pages.dart index e71c5a3a..bd6b683f 100644 --- a/lib/features/home/presentation/widgets/map/testmap_pages.dart +++ b/lib/features/home/presentation/widgets/map/testmap_pages.dart @@ -12,6 +12,14 @@ import 'package:maibu_satabot_v2/features/home/presentation/widgets/startpoint_a import '../path_list_pages.dart'; +class PlotData { + final String id; // 唯一ID,用于删除 + final String plotName; // 地块名称 + final String imageUrl; // 图片URL(本地/assets/网络都可) + + PlotData({required this.id, required this.plotName, required this.imageUrl}); +} + class MapPageEnterprise extends StatefulWidget { const MapPageEnterprise({Key? key}) : super(key: key); @@ -21,12 +29,15 @@ class MapPageEnterprise extends StatefulWidget { class _MapPageEnterpriseState extends State { final MapController _mapController = MapController(); + final TextEditingController _plotNameController = TextEditingController(); LatLng? _currentLatLng; StreamSubscription? _positionSub; bool _hasMovedOnce = false; bool _isPanelOpen = false; // 控制面板显示/隐藏 bool _directionBoxOpen = false; //航线面板显示/隐藏 + final bool _saveBoxOpen = true; //保存按钮显示/隐藏 + bool _isListBoxOpen = false; //列表面板显示/隐藏 RobotMode _currentRobotMode = RobotMode.point; //打点模式 AreaMode _currentAreaMode = AreaMode.work; //作业区域还是障碍物区域 @@ -34,13 +45,29 @@ class _MapPageEnterpriseState extends State { // ========== 核心新增状态 ========== final List _markedPoints = []; // 存储所有打点坐标 - LatLng get _mapCenter => _mapController.center; // 实时获取地图中心坐标 + LatLng _mapCenter = const LatLng(39.9042, 116.4074); final double _headingAngle = 0.0; // 当前机器航向角(单位:度) //打点 double _workDistance = 0.0; // 作业行距(单位:米) double _angle = 0.0; // 航线方向角(单位:度) // ================================= + //测试数据 + final List _plotList = [ + PlotData( + id: '1', + plotName: '北地块(一号田)', + imageUrl: '', // 本地图片 + // 网络图片示例:imageUrl: 'https://xxx.com/plot1.jpg', + ), + PlotData(id: '2', plotName: '东地块(二号田)', imageUrl: ''), + PlotData(id: '3', plotName: '西地块(三号田)', imageUrl: ''), + PlotData(id: '3', plotName: '西地块(三号田)', imageUrl: ''), + PlotData(id: '3', plotName: '西地块(三号田)', imageUrl: ''), + PlotData(id: '3', plotName: '西地块(三号田)', imageUrl: ''), + PlotData(id: '3', plotName: '西地块(三号田)', imageUrl: ''), + PlotData(id: '3', plotName: '西地块(三号田)', imageUrl: ''), + ]; @override void initState() { @@ -49,11 +76,116 @@ class _MapPageEnterpriseState extends State { // 监听地图移动事件,实时更新连线 _mapController.mapEventStream.listen((event) { if (event is MapEventMove || event is MapEventMoveEnd) { - setState(() {}); // 触发UI刷新,更新连线 + if (mounted && _mapController.camera != null) { + // 核心:直接获取原始经纬度,不做任何截断,保留最大精度 + final originalCenter = _mapController.camera!.center; + // 显式创建新的 LatLng 对象,确保精度不丢失(避免引用传递导致的隐式截断) + final highPrecisionCenter = LatLng( + originalCenter.latitude, // 原始纬度(保留全部小数位) + originalCenter.longitude, // 原始经度(保留全部小数位) + ); + + setState(() { + _mapCenter = highPrecisionCenter; + }); + + // 可选:打印验证精度(保留15位小数) + debugPrint( + '地图中心更新(高精度):纬度=${_mapCenter.latitude.toStringAsFixed(15)}, 经度=${_mapCenter.longitude.toStringAsFixed(15)}', + ); + } } }); } + void _showSavePlotDialog() { + // 清空上次的输入内容 + _plotNameController.clear(); + + // 显示弹窗 + showDialog( + context: context, + builder: (BuildContext context) { + return AlertDialog( + title: const Text('保存地块'), + content: TextField( + controller: _plotNameController, + decoration: const InputDecoration( + hintText: '请输入地块名称(如:北地块、一号田)', + border: OutlineInputBorder(), + labelText: '地块名称', + ), + ), + actions: [ + // 取消按钮 + TextButton( + onPressed: () { + Navigator.of(context).pop(); // 关闭弹窗 + }, + child: const Text('取消'), + ), + // 确认保存按钮 + TextButton( + onPressed: () { + // 获取输入的地块名称并去除首尾空格 + String plotName = _plotNameController.text.trim(); + + // 验证输入是否为空 + if (plotName.isEmpty) { + ScaffoldMessenger.of(context).showSnackBar( + const SnackBar( + content: Text('地块名称不能为空!'), + backgroundColor: Colors.red, + ), + ); + return; + } + + // 执行保存逻辑 + _savePlotData(plotName); + + // 关闭弹窗 + Navigator.of(context).pop(); + + // 保存成功提示 + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('地块「$plotName」保存成功!'), + backgroundColor: Colors.green, + ), + ); + }, + child: const Text('保存'), + ), + ], + ); + }, + ); + } + + // 3. 保存地块数据的核心方法(这里写你的实际保存逻辑) + void _savePlotData(String plotName) { + // 示例:打印保存的信息(实际开发中替换为存数据库/本地存储/接口调用) + debugPrint('===== 保存地块数据 ====='); + debugPrint('地块名称:$plotName'); + debugPrint('打点数量:${_markedPoints.length}'); + debugPrint('打点坐标:$_markedPoints'); + debugPrint('作业模式:$_currentWorkMode'); + + // 这里可以添加实际的保存逻辑: + // 1. 存到本地数据库(如Hive/SQLite) + // 2. 调用API上传到服务器 + // 3. 保存到SharedPreferences(简单数据) + } + + List _getPolygonPoints() { + if (_markedPoints.isEmpty || _mapController.camera == null) return []; + + List polygonPoints = List.from(_markedPoints); + polygonPoints.add(_mapCenter); + return polygonPoints; + } + void _undoLastPoint() { if (_markedPoints.isNotEmpty) { setState(() { @@ -151,7 +283,7 @@ class _MapPageEnterpriseState extends State { _markedPoints.add(_mapCenter); // 在地图中心打点 }); debugPrint( - '新增打点:第${_markedPoints.length}个点,经纬度:${_mapCenter.latitude.toStringAsFixed(6)}, ${_mapCenter.longitude.toStringAsFixed(6)}', + '$_markedPoints,新增打点:第${_markedPoints.length}个点,经纬度:${_mapCenter.latitude.toStringAsFixed(20)}, ${_mapCenter.longitude.toStringAsFixed(20)}', ); } @@ -161,6 +293,111 @@ class _MapPageEnterpriseState extends State { super.dispose(); } + // 在State类中添加列表项构建方法 + Widget _buildPlotListItem(PlotData plot) { + return Container( + margin: const EdgeInsets.symmetric(horizontal: 16, vertical: 4), + padding: const EdgeInsets.all(12), + decoration: BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.circular(8), + border: Border.all(color: Colors.grey[100]!), + ), + child: Row( + children: [ + // 1. 地块图片 + ClipRRect( + borderRadius: BorderRadius.circular(8), + child: Image.asset( + plot.imageUrl, + // 网络图片替换为:Image.network(plot.imageUrl, ...) + width: 40, + height: 40, + fit: BoxFit.cover, + // 图片加载失败占位 + errorBuilder: (context, error, stackTrace) { + return Container( + width: 40, + height: 40, + color: Colors.grey[200], + child: const Icon(Icons.image_outlined, color: Colors.grey), + ); + }, + ), + ), + + const SizedBox(width: 12), + + // 2. 地块名称(占满剩余空间) + Expanded( + child: Text( + plot.plotName, + style: const TextStyle(fontSize: 16, color: Colors.black87), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ), + + // 3. 删除按钮 + IconButton( + onPressed: () { + // 弹出确认删除对话框 + _showDeleteConfirmDialog(plot); + }, + icon: const Icon( + Icons.delete_outline, + color: Colors.redAccent, + size: 20, + ), + padding: EdgeInsets.zero, + constraints: const BoxConstraints(), + ), + ], + ), + ); + } + + // 实现删除确认弹窗 + void _showDeleteConfirmDialog(PlotData plot) { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + title: const Text('确认删除'), + content: Text('是否删除地块「${plot.plotName}」?删除后不可恢复。'), + actions: [ + TextButton( + onPressed: () { + Navigator.of(context).pop(); + }, + child: const Text('取消'), + ), + TextButton( + onPressed: () { + // 执行删除逻辑 + setState(() { + _plotList.removeWhere((item) => item.id == plot.id); + }); + + // 关闭弹窗 + Navigator.of(context).pop(); + + // 提示删除成功 + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text('已删除地块「${plot.plotName}」'), + backgroundColor: Colors.green, + ), + ); + }, + child: const Text('删除', style: TextStyle(color: Colors.red)), + ), + ], + ); + }, + ); + } + @override Widget build(BuildContext context) { final screenHeight = MediaQuery.of(context).size.height; @@ -231,6 +468,19 @@ class _MapPageEnterpriseState extends State { ), ], ), + if (_currentWorkMode == WorkMode.bow && + _markedPoints.isNotEmpty) + PolygonLayer( + polygons: [ + Polygon( + points: _getPolygonPoints(), + color: Colors.green.withOpacity(0.2), + borderColor: Colors.green.withOpacity(0.5), + borderStrokeWidth: 1, + isFilled: true, + ), + ], + ), /// ========== 新增:历史打点的绿色标记 ========== MarkerLayer( @@ -293,6 +543,45 @@ class _MapPageEnterpriseState extends State { ), ), ), + //保存按钮 + if (_saveBoxOpen) + Positioned( + left: 16, + top: maxTop > 10 ? 11 : maxTop, + child: // 改用小尺寸按钮容器,替代默认大尺寸FloatingActionButton + Container( + width: 40, // 按钮宽度(默认FAB是56,改为40更小巧) + height: 40, // 按钮高度 + decoration: BoxDecoration( + color: const Color(0xFF00C853), // 保留绿色主题 + shape: BoxShape.circle, // 圆形 + boxShadow: [ + BoxShadow( + color: Colors.black12, + blurRadius: 4, // 对应elevation:4的阴影效果 + offset: const Offset(0, 2), // 阴影偏移 + ), + ], + ), + child: IconButton( + onPressed: () { + _showSavePlotDialog(); + //// 点击保存按钮的逻辑 + //// 1. 可以直接调用保存方法 + //_saveCurrentPath(); + //// 2. 也可以弹出输入框让用户输入路径名称(推荐) + //_showSavePathDialog(); + }, + icon: const Icon( + Icons.save, + color: Colors.white, + size: 18, // 图标尺寸缩小(原20→18) + ), + padding: EdgeInsets.zero, // 移除IconButton默认内边距 + constraints: const BoxConstraints(), // 解除IconButton尺寸限制 + ), + ), + ), // 右侧悬浮菜单 Positioned( height: 336, @@ -306,6 +595,11 @@ class _MapPageEnterpriseState extends State { _isPanelOpen = isOpen; }); }, + onListBox: (bool isOpen) { + setState(() { + _isListBoxOpen = isOpen; + }); + }, onWorkModeSelected: (mode) { _currentWorkMode = mode; debugPrint('外部收到作业模式:$mode'); @@ -324,6 +618,9 @@ class _MapPageEnterpriseState extends State { initialRobotMode: RobotMode.point, initialAreaMode: AreaMode.work, onComplete: () { + debugPrint( + '操作完成回调:当前机器人模式=$_currentRobotMode,当前区域模式=$_currentAreaMode,当前作业模式:$_currentWorkMode,作业区域点:$_markedPoints,作业行距=$_workDistance,航线方向角=$_angle', + ); setState(() => _isPanelOpen = false); }, onUndoTap: _undoLastPoint, @@ -386,6 +683,129 @@ class _MapPageEnterpriseState extends State { }, ), ), + // 在build方法的Stack中添加抽屉组件 + if (_isListBoxOpen) + // 半透明背景 + 底部抽屉 + Positioned.fill( + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + // 1. 半透明遮罩(点击关闭抽屉) + Expanded( + child: GestureDetector( + onTap: () { + setState(() { + _isListBoxOpen = false; + }); + }, + child: Container(color: Colors.black.withOpacity(0.3)), + ), + ), + + // 2. 底部抽屉主体 + Container( + width: double.infinity, + decoration: const BoxDecoration( + color: Colors.white, + borderRadius: BorderRadius.vertical( + top: Radius.circular(16), // 顶部圆角 + ), + boxShadow: [ + BoxShadow( + color: Colors.black12, + blurRadius: 10, + offset: Offset(0, -2), + ), + ], + ), + // 限制抽屉高度(可自定义) + constraints: const BoxConstraints( + maxHeight: 600, + minHeight: 200, + ), + child: Column( + children: [ + // 顶部标题栏 + Container( + padding: const EdgeInsets.symmetric( + horizontal: 16, + vertical: 12, + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + // 标题:显示数据总数 + Text( + '地块列表(共${_plotList.length}条)', + style: const TextStyle( + fontSize: 18, + fontWeight: FontWeight.bold, + color: Colors.black87, + ), + ), + + // 关闭按钮 + IconButton( + onPressed: () { + setState(() { + _isListBoxOpen = false; + }); + }, + icon: const Icon( + Icons.close, + color: Colors.grey, + size: 20, + ), + ), + ], + ), + ), + + const Divider(height: 1, color: Colors.grey), + + // 列表内容(可滚动) + Expanded( + child: _plotList.isEmpty + ? // 空数据提示 + const Center( + child: Column( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Icon( + Icons.inbox_outlined, + color: Colors.grey, + size: 48, + ), + SizedBox(height: 16), + Text( + '暂无地块数据', + style: TextStyle( + color: Colors.grey, + fontSize: 16, + ), + ), + ], + ), + ) + : // 列表项 + ListView.builder( + padding: const EdgeInsets.symmetric( + vertical: 8, + ), + itemCount: _plotList.length, + itemBuilder: (context, index) { + final plot = _plotList[index]; + return _buildPlotListItem(plot); + }, + ), + ), + ], + ), + ), + ], + ), + ), ], ), ), diff --git a/lib/features/home/presentation/widgets/path_list_pages.dart b/lib/features/home/presentation/widgets/path_list_pages.dart index 21ce7015..733d98cf 100644 --- a/lib/features/home/presentation/widgets/path_list_pages.dart +++ b/lib/features/home/presentation/widgets/path_list_pages.dart @@ -4,11 +4,14 @@ import 'package:maibu_satabot_v2/features/home/presentation/widgets/common/enum. class VerticalFloatMenu extends StatefulWidget { final Function(int index, String name)? onItemTap; final ValueChanged? onEditTap; - final ValueChanged? onWorkModeSelected; // 新增:作业模式选择回调 + final ValueChanged? onListBox; + final ValueChanged? onWorkModeSelected; + const VerticalFloatMenu({ super.key, this.onItemTap, this.onEditTap, + this.onListBox, this.onWorkModeSelected, }); @@ -62,7 +65,7 @@ class _VerticalFloatMenuState extends State { setState(() => _selectedIndex = index); widget.onItemTap?.call(index, name); - + //圈地 if (index == 0) { final result = await _showModeDialog(); @@ -74,6 +77,10 @@ class _VerticalFloatMenuState extends State { //_showBottomPanel(); } } + //列表 + if (index == 1) { + widget.onListBox?.call(true); + } }, child: Container( width: double.infinity, @@ -217,10 +224,4 @@ class _VerticalFloatMenuState extends State { ), ); } - - void _handleSubmit() { - debugPrint("作业模式: $_selectedWorkMode"); - debugPrint("机器人模式: $_robotMode"); - debugPrint("区域模式: $_areaMode"); - } } diff --git a/lib/features/home/presentation/widgets/startpoint_area.dart b/lib/features/home/presentation/widgets/startpoint_area.dart index 3737971f..058aef28 100644 --- a/lib/features/home/presentation/widgets/startpoint_area.dart +++ b/lib/features/home/presentation/widgets/startpoint_area.dart @@ -185,8 +185,8 @@ class _BottomOperationPanelState extends State { widget.onAddTap?.call(); }, child: Container( - width: 60, - height: 60, + width: 40, + height: 40, decoration: const BoxDecoration( color: Color(0xFF00C853), shape: BoxShape.circle, @@ -209,7 +209,7 @@ class _BottomOperationPanelState extends State { ), ], ), - const SizedBox(height: 32), + const SizedBox(height: 16), // 操作按钮行 Row( @@ -228,7 +228,7 @@ class _BottomOperationPanelState extends State { }), ], ), - const SizedBox(height: 32), + const SizedBox(height: 16), ], ); } @@ -353,8 +353,8 @@ class _BottomOperationPanelState extends State { child: Column( children: [ Container( - width: 50, - height: 50, + width: 40, + height: 40, decoration: BoxDecoration( color: isEnabled ? Colors.blue : Colors.grey[300], shape: BoxShape.circle,