退出登陆的重新设计到我的页面；优化高清地图的加载和显示（冷启动稍慢，再次秒开）；声网通用组件遗漏文件；
This commit is contained in:
@@ -141,6 +141,8 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
bool _isToastShowing = false;
|
||||
|
||||
final MapController _mapController = MapController();
|
||||
/// 全部场站高清叠加图层：初始用内置兜底，GetCapabilities 拉取成功后自动替换为动态范围
|
||||
List<TileLayer> _stationLayers = kAllStationTileLayers;
|
||||
// 初始化轨迹管理器（泛型指定为LatLng）
|
||||
late final TracePoint<PlotPoint> _traceManager;
|
||||
late String workMode = "覆盖模式"; // 作业模式：默认值为"覆盖模式"
|
||||
@@ -274,9 +276,24 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
}
|
||||
});
|
||||
|
||||
// 🌐 场站高清图层：监听动态范围更新 + 触发一次 GetCapabilities 刷新
|
||||
StationLayerRepo.instance.addListener(_onStationLayersUpdated);
|
||||
StationLayerRepo.instance.refresh();
|
||||
|
||||
// 🔄 进场刷新场站数据：避免 siteMapName/默认中心沿用上次缓存（无需退回首页重新请求接口）
|
||||
sl<SiteCubit>().reloadSites();
|
||||
|
||||
debugPrint('✅ [MapPage] initState 完成');
|
||||
}
|
||||
|
||||
/// GeoServer 动态范围拉取完成 → 用最新范围重建叠加图层
|
||||
void _onStationLayersUpdated() {
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_stationLayers = StationLayerRepo.instance.buildLayers();
|
||||
});
|
||||
}
|
||||
|
||||
// 🔥 核心修复：监听路径规划应答流
|
||||
void _setupPathPlanningListener() {
|
||||
debugPrint('🔗 [MapPage] 开始监听路径规划指令应答 (CMD: 0x01)');
|
||||
@@ -1607,6 +1624,37 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
_mapController.move(_currentLatLng!, 17);
|
||||
}
|
||||
|
||||
/// 手动刷新高清场站图层（不动用户的作业/障碍物绘制数据）：
|
||||
/// ① 清 WMS 瓦片缓存（拿后端最新影像）② 重拉场站接口（更新 siteMapName 映射）
|
||||
/// ③ 重拉 GetCapabilities（更新图层范围数组）④ 重建图层 ⑤ 定位到最新场站中心
|
||||
Future<void> _onRefreshStationLayers() async {
|
||||
debugPrint('🔄 [刷新图层] 开始手动刷新高清场站图层...');
|
||||
_showPageToast(message: '正在刷新高清图层...', type: ToastType.loading);
|
||||
try {
|
||||
await CachedWmsImage.clearTileCache();
|
||||
await sl<SiteCubit>().reloadSites();
|
||||
await StationLayerRepo.instance.refresh();
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_stationLayers = StationLayerRepo.instance.buildLayers();
|
||||
});
|
||||
final c = _getDefaultValidCenter();
|
||||
_mapController.move(c, 18);
|
||||
_cancelAllToast();
|
||||
_showPageToast(message: '已刷新到最新图层', type: ToastType.success);
|
||||
debugPrint('✅ [刷新图层] 完成，定位到 $c');
|
||||
} catch (e) {
|
||||
debugPrint('❌ [刷新图层] 失败: $e');
|
||||
if (!mounted) return;
|
||||
_cancelAllToast();
|
||||
final msg = e.toString();
|
||||
_showPageToast(
|
||||
message: '刷新失败: ${msg.length > 50 ? msg.substring(0, 50) : msg}',
|
||||
type: ToastType.error,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// ========== 障碍物模式：完成当前障碍物绘制 ==========
|
||||
void _completeObstacle() {
|
||||
debugPrint(
|
||||
@@ -1716,6 +1764,7 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
StationLayerRepo.instance.removeListener(_onStationLayersUpdated);
|
||||
_traceManager.reset();
|
||||
_mapController.dispose();
|
||||
_pathPlanningSub?.cancel(); // 🔥 取消订阅
|
||||
@@ -2178,10 +2227,10 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
),
|
||||
|
||||
/// GeoServer 全部场站无人机高清影像叠加层（WGS84 基准，无偏移）
|
||||
/// 一次性叠加所有场站图层：滑到哪个场站区域（zoom>=16）就自动显示哪个高清图
|
||||
/// 每层各自 tileBounds，框外瓦片不请求，开销极小；苏州等手动滑过去即可叠加
|
||||
/// 当前 WMS 兜底（原生 EPSG:4326）；公司补配 GWC EPSG:3857 后改 geoserver_suzhou_layer.dart
|
||||
...kAllStationTileLayers,
|
||||
/// 图层范围优先取自 GeoServer GetCapabilities（动态），失败回退内置兜底
|
||||
/// 滑到哪个场站区域（zoom>=16）就自动显示哪个高清图；每层各自 tileBounds，框外不请求
|
||||
/// WMS 瓦片带磁盘缓存+超时（CachedWmsImage），二次进入秒开
|
||||
..._stationLayers,
|
||||
//if (isDjMapShow) DJITileLayer(stationName: _currentStation.name, mapController: _mapController),
|
||||
|
||||
// 绘制path折线（Line模式）
|
||||
@@ -4542,6 +4591,37 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
),
|
||||
),
|
||||
|
||||
/// 悬浮“刷新高清图层”按钮：后端改了图层/影像/场站映射后，
|
||||
/// 点它强制拉最新（清瓦片缓存 + 重拉场站接口 + 重拉 GetCapabilities + 重新定位）
|
||||
Positioned(
|
||||
top: 110,
|
||||
left: 10,
|
||||
child: GestureDetector(
|
||||
onTap: _onRefreshStationLayers,
|
||||
child: Container(
|
||||
width: 40,
|
||||
height: 40,
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.white.withOpacity(0.8),
|
||||
borderRadius: BorderRadius.circular(20),
|
||||
boxShadow: [
|
||||
BoxShadow(
|
||||
color: Colors.black12,
|
||||
blurRadius: 3,
|
||||
offset: const Offset(0, 2),
|
||||
),
|
||||
],
|
||||
),
|
||||
alignment: Alignment.center,
|
||||
child: const Icon(
|
||||
Icons.refresh,
|
||||
color: Colors.black87,
|
||||
size: 22,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
/// 核心：地图正中心固定定位标
|
||||
if (_currentRobotMode == RobotMode.point)
|
||||
Positioned(
|
||||
@@ -4900,18 +4980,22 @@ class _MapPageEnterpriseState extends State<MapPageEnterprise> {
|
||||
.deleteWorkRecord(
|
||||
deletedPlot.plotName,
|
||||
);
|
||||
final userId =
|
||||
context
|
||||
.read<AppUserCubit>()
|
||||
// 🔥 修复：删除后按“当前全局场站”重查，与打开列表(onListBox)走同一接口 selectBySiteId
|
||||
// 原逻辑用 loadWorkRecords(userId) 走 selectByUserId（按登录用户查），
|
||||
// 与列表口径不一致，导致删除后重查的数据不对；重新点列表才恢复正常。
|
||||
final selectedSite =
|
||||
sl<SiteCubit>()
|
||||
.state
|
||||
.user
|
||||
?.userId ??
|
||||
"";
|
||||
await context
|
||||
.read<DevicesCubit>()
|
||||
.loadWorkRecords(userId);
|
||||
.selectedSite;
|
||||
if (selectedSite != null) {
|
||||
await context
|
||||
.read<DevicesCubit>()
|
||||
.loadWorkRecordsBySiteId(
|
||||
selectedSite.id,
|
||||
);
|
||||
}
|
||||
|
||||
setState(() {});
|
||||
if (mounted) setState(() {});
|
||||
});
|
||||
},
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user