机器状态数据和地图切换,系统配置页面
This commit is contained in:
@@ -47,11 +47,13 @@ import 'package:maibu_satabot_v2/features/home/presentation/widgets/BottomDirect
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/common/commonFn.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/common/enum.dart';
|
||||
import 'package:maibu_satabot_v2/components/input_confirm_dialog.dart';
|
||||
import 'package:maibu_satabot_v2/components/route_type_picker.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/common/tracepoint.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/CenterLocation.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/HeadingPointer.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/dji_tile_layer.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/geoserver_suzhou_layer.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/map/app_base_map_layer.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/obsToast.dart';
|
||||
import 'package:maibu_satabot_v2/features/home/presentation/widgets/startpoint_area.dart';
|
||||
import 'package:image/image.dart' as _image; // 注意命名空间冲突,使用 as img
|
||||
@@ -904,8 +906,14 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
}
|
||||
}
|
||||
|
||||
void _showSavePlotDialog() {
|
||||
void _showSavePlotDialog() async {
|
||||
final loc = AppLocalizations.of(context);
|
||||
|
||||
// 后端 workRecord.routeType 必填(与新版「地图与区域编辑」共用同一接口):
|
||||
// 先选规划类型,再输地块名称;取消则不进入保存。
|
||||
final RouteType? routeType = await showRouteTypePicker(context);
|
||||
if (routeType == null || !mounted) return;
|
||||
|
||||
showInputConfirmDialog(
|
||||
context: context,
|
||||
title: loc.translate('route_planning.save_plot'), // 自定义标题
|
||||
@@ -947,10 +955,10 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
// 4. 处理截图结果并保存
|
||||
if (mounted) {
|
||||
if (imgBase64 != null) {
|
||||
_savePlotData(plotName, imgBase64); // 传入 Base64
|
||||
_savePlotData(plotName, imgBase64, routeType.code); // 传入 Base64
|
||||
} else {
|
||||
// 截图失败时,允许空图片保存(可根据业务调整为强制失败)
|
||||
_savePlotData(plotName, null);
|
||||
_savePlotData(plotName, null, routeType.code);
|
||||
_showPageToast(
|
||||
message:
|
||||
loc.translate('route_planning.save_success') +
|
||||
@@ -1179,7 +1187,11 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
debugPrint('📤 [保存地块-请求详情] ================= END =================');
|
||||
}
|
||||
|
||||
Future<void> _savePlotData(String plotName, String? imgBase64) async {
|
||||
Future<void> _savePlotData(
|
||||
String plotName,
|
||||
String? imgBase64,
|
||||
String routeType,
|
||||
) async {
|
||||
debugPrint('🔍 [保存地块] ====== _savePlotData 被调用, plotName=$plotName ======');
|
||||
final loc = AppLocalizations.of(context);
|
||||
// 🔥 V2 适配:使用 SiteCubit 获取站点ID(从 v2 首页场站选择获取,有默认值)
|
||||
@@ -1247,7 +1259,12 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
? WorkMode.bow.modeCode
|
||||
: WorkMode.custom.modeCode;
|
||||
workRecord['mode'] = modeCode;
|
||||
debugPrint('📤 [保存地块] workRecord 附加字段: orgId=$orgId, mode=$modeCode');
|
||||
// 🔥 后端必填的规划类型(Java 枚举 RouteType.name()),与 mode 平级;
|
||||
// 缺失时后端直接返回「未选择规划类型」
|
||||
workRecord['routeType'] = routeType;
|
||||
debugPrint(
|
||||
'📤 [保存地块] workRecord 附加字段: orgId=$orgId, mode=$modeCode, routeType=$routeType',
|
||||
);
|
||||
final String workRecordJson = jsonEncode(workRecord);
|
||||
final http.MultipartRequest request = http.MultipartRequest(
|
||||
'POST',
|
||||
@@ -2309,15 +2326,8 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
onTap: (_, __) {}, // 空实现,禁用地图点击响应
|
||||
),
|
||||
children: [
|
||||
/// ESRI World Imagery(WGS84 坐标系,全球高清卫星图)
|
||||
/// 替代高德地图(GCJ02),统一坐标系,无需坐标转换
|
||||
TileLayer(
|
||||
urlTemplate:
|
||||
'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||
userAgentPackageName: 'com.example.app',
|
||||
minZoom: 0,
|
||||
maxZoom: 19,
|
||||
),
|
||||
/// 底图:中文=ESRI(境内稳定),非中文=Google(英文地名,不可达自动回退)
|
||||
const AppBaseMapLayer(maxZoom: 22),
|
||||
|
||||
/// GeoServer 全部场站无人机高清影像叠加层(WGS84 基准,无偏移)
|
||||
/// 图层范围优先取自 GeoServer GetCapabilities(动态),失败回退内置兜底
|
||||
|
||||
Reference in New Issue
Block a user