高清地图+无人机实时信息显示异常问题修复
This commit is contained in:
@@ -1501,12 +1501,13 @@ class FloatBarWidgetState extends State<FloatBarWidget> {
|
||||
},
|
||||
),
|
||||
children: [
|
||||
// 高德地图瓦片(最底层)
|
||||
// ESRI World Imagery(WGS84 坐标系,全球高清卫星图)
|
||||
// 替代高德地图(GCJ02),统一坐标系,无需坐标转换
|
||||
TileLayer(
|
||||
urlTemplate:
|
||||
'https://webst0{s}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
|
||||
subdomains: ['1', '2', '3', '4'],
|
||||
urlTemplate: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||
userAgentPackageName: 'com.example.app',
|
||||
minZoom: 0,
|
||||
maxZoom: 19,
|
||||
),
|
||||
|
||||
// 轨迹线(中间层)
|
||||
|
||||
@@ -36,6 +36,7 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
|
||||
late DroneOsdDataSource _osdDataSource;
|
||||
StreamSubscription<DroneOsdEntity>? _stationOsdSubscription;
|
||||
StreamSubscription<Object?>? _blocStateSubscription;
|
||||
|
||||
/// 静态缓存:按 gatewaySn 分区,跨页面实例保留每个机场上次的 host 数据
|
||||
/// 避免进入新机场时显示上一个机场的缓存数据
|
||||
@@ -62,23 +63,34 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
);
|
||||
|
||||
_osdDataSource = sl<DroneOsdDataSource>();
|
||||
_startStationOsdListening();
|
||||
|
||||
_hasInitialized = true;
|
||||
}
|
||||
|
||||
void _startStationOsdListening() {
|
||||
// 使用 station 自带的 deviceSn + gatewaySn,与列表页预订阅参数一致
|
||||
// 避免因参数不同导致 DataSource 重新订阅、打断数据流
|
||||
_osdDataSource.startListening(
|
||||
deviceSn: widget.station.deviceSn,
|
||||
gatewaySn: widget.station.gatewaySn,
|
||||
);
|
||||
|
||||
// 🔥 立即建立 stationOsdStream 的监听(关键!)
|
||||
// 否则 _parseAndUpdateHostData 永远不会被调用,机场状态卡片一直显示"未知"
|
||||
_stationOsdSubscription = _osdDataSource.stationOsdStream.listen((osd) {
|
||||
if (!mounted) return;
|
||||
_parseAndUpdateHostData(osd);
|
||||
});
|
||||
|
||||
// 🔥 监听 Bloc 状态变化,等数据加载完成后再确保 MQTT 订阅建立
|
||||
_blocStateSubscription = _bloc.stream.listen((state) {
|
||||
if (state is UAVDetailLoaded && mounted) {
|
||||
debugPrint('✅ [DroneStationDetailPage] Bloc 数据加载完成,确保 MQTT 订阅');
|
||||
debugPrint(' deviceSn: ${state.detail.deviceSn}');
|
||||
debugPrint(' gatewaySn: ${widget.station.gatewaySn}');
|
||||
|
||||
// 确保 MQTT 订阅建立
|
||||
_osdDataSource.startListening(
|
||||
deviceSn: state.detail.deviceSn,
|
||||
gatewaySn: widget.station.gatewaySn,
|
||||
);
|
||||
_droneSn = state.detail.deviceSn;
|
||||
|
||||
// 取消监听(只执行一次)
|
||||
_blocStateSubscription?.cancel();
|
||||
}
|
||||
});
|
||||
|
||||
_hasInitialized = true;
|
||||
}
|
||||
|
||||
void _parseAndUpdateHostData(DroneOsdEntity osd) {
|
||||
@@ -95,6 +107,18 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
final hostData = data['data'] is Map ? (data['data'] as Map)['host'] : null;
|
||||
if (hostData == null || hostData is! Map) return;
|
||||
|
||||
// 🔥 关键检查:确认是否包含机场状态的关键字段
|
||||
// 避免将其他类型的OSD消息(如设备状态、电池信息等)覆盖机场状态数据
|
||||
final hasHostFields = hostData.containsKey('cover_state') ||
|
||||
hostData.containsKey('drone_in_dock') ||
|
||||
hostData.containsKey('temperature') ||
|
||||
hostData.containsKey('humidity');
|
||||
if (!hasHostFields) {
|
||||
debugPrint('⚠️ [DroneStationDetailPage] ⚠️ 此消息不包含机场状态字段,跳过更新!');
|
||||
debugPrint(' hostData keys: ${hostData.keys.toList()}');
|
||||
return; // 不是机场状态数据,直接返回
|
||||
}
|
||||
|
||||
// 🔥 基于已有数据合并,只更新非 null 字段,避免 Type 2 消息覆盖已有值
|
||||
final Map<String, dynamic> merged = Map<String, dynamic>.from(
|
||||
_stationHostData.value,
|
||||
@@ -111,10 +135,13 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
_put('humidity', (hostData['humidity'] as num?)?.toDouble());
|
||||
_put('wind_speed', (hostData['wind_speed'] as num?)?.toDouble());
|
||||
_put('rainfall', hostData['rainfall']?.toString());
|
||||
_put('cover_state', hostData['cover_state']?.toString());
|
||||
_put('drone_in_dock', hostData['drone_in_dock']?.toString());
|
||||
|
||||
// 🔥 不再做严格校验,直接存储原始值,让UI层自己去解析
|
||||
_put('cover_state', hostData['cover_state']);
|
||||
_put('drone_in_dock', hostData['drone_in_dock']);
|
||||
_put('temperature', (hostData['temperature'] as num?)?.toDouble());
|
||||
_put('putter_state', hostData['putter_state']?.toString());
|
||||
_put('putter_state', hostData['putter_state']);
|
||||
|
||||
_put(
|
||||
'supplement_light_state',
|
||||
hostData['supplement_light_state']?.toString(),
|
||||
@@ -144,25 +171,17 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
final acData = hostData['air_conditioner'];
|
||||
if (acData is Map) {
|
||||
_put('air_conditioner', acData);
|
||||
|
||||
// 解析空调开关状态
|
||||
final acStateVal = int.tryParse(acData['air_conditioner_state']?.toString() ?? '') ?? -1;
|
||||
if (acStateVal == 0 || acStateVal == 1) {
|
||||
_put('air_conditioner_state', acStateVal.toString());
|
||||
}
|
||||
|
||||
// 解析空调运行时间
|
||||
final switchTime = acData['switch_time'];
|
||||
if (switchTime != null) {
|
||||
_put('air_conditioner_switch_time', '$switchTime');
|
||||
}
|
||||
// 不单独提取air_conditioner_state,让UI层自己解析
|
||||
}
|
||||
|
||||
// 🔥 存储到ValueNotifier触发UI更新
|
||||
_stationHostData.value = merged;
|
||||
// 同步写入按 gatewaySn 分区的静态缓存
|
||||
// 同步写入按gatewaySn分区的静态缓存
|
||||
_cachedHostDataBySn[widget.station.gatewaySn] = Map<String, dynamic>.from(
|
||||
merged,
|
||||
);
|
||||
|
||||
debugPrint('[DroneStationDetailPage] 收到机场状态数据');
|
||||
}
|
||||
|
||||
/// 🔥 页面重新激活时调用(从其他页面返回时)
|
||||
@@ -198,6 +217,7 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
@override
|
||||
void dispose() {
|
||||
_stationOsdSubscription?.cancel();
|
||||
_blocStateSubscription?.cancel();
|
||||
// 只调用 stopListening 减少引用计数,不调用 dispose()
|
||||
// 因为 DroneOsdDataSource 是 LazySingleton,被列表页和详情页共享
|
||||
// 详情页退出后列表页可能仍需要该订阅
|
||||
@@ -331,17 +351,6 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
|
||||
Widget _buildContent(UAVDetailEntity detail) {
|
||||
_detail = detail;
|
||||
final newDroneSn = detail.deviceSn;
|
||||
|
||||
// 只在 droneSn 真正变化时才重新订阅,避免 Bloc 刷新时重复 startListening
|
||||
// 导致引用计数虚增、dispose 时无法真正取消订阅
|
||||
if (newDroneSn != null && newDroneSn.isNotEmpty && newDroneSn != _droneSn) {
|
||||
_droneSn = newDroneSn;
|
||||
_osdDataSource.startListening(
|
||||
deviceSn: newDroneSn,
|
||||
gatewaySn: widget.station.gatewaySn,
|
||||
);
|
||||
}
|
||||
|
||||
return RefreshIndicator(
|
||||
onRefresh: _handleRefresh,
|
||||
@@ -484,8 +493,11 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
final rainfall = hostData['rainfall'];
|
||||
final coverState = hostData['cover_state'];
|
||||
final droneInDock = hostData['drone_in_dock'];
|
||||
final acState = hostData['air_conditioner_state'];
|
||||
final alarmState = hostData['alarm_state'];
|
||||
|
||||
// 🔥 从 air_conditioner Map 中解析空调状态
|
||||
final acDataMap = hostData['air_conditioner'];
|
||||
final acState = acDataMap is Map ? acDataMap['air_conditioner_state'] : null;
|
||||
|
||||
String envTempStr = '未知';
|
||||
if (envTemp != null) {
|
||||
@@ -516,7 +528,8 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
String coverStr = '未知';
|
||||
Color coverColor = const Color(0xFF86909C);
|
||||
if (coverState != null) {
|
||||
final state = int.tryParse(coverState) ?? -1;
|
||||
// 🔥 像 DroneStationOsdCard 一样解析,支持多种数据格式
|
||||
final state = coverState is int ? coverState : int.tryParse(coverState.toString()) ?? -1;
|
||||
if (state == 1) {
|
||||
coverStr = '开启';
|
||||
coverColor = const Color(0xFFFF7D00);
|
||||
@@ -529,7 +542,8 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
String droneDockStr = '未知';
|
||||
Color droneDockColor = const Color(0xFF86909C);
|
||||
if (droneInDock != null) {
|
||||
final state = int.tryParse(droneInDock) ?? -1;
|
||||
// 🔥 像 DroneStationOsdCard 一样解析
|
||||
final state = droneInDock is int ? droneInDock : int.tryParse(droneInDock.toString()) ?? -1;
|
||||
if (state == 1) {
|
||||
droneDockStr = '在库内';
|
||||
droneDockColor = const Color(0xFF00B42A);
|
||||
@@ -542,7 +556,7 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
String acStr = '未知';
|
||||
Color acColor = const Color(0xFF86909C);
|
||||
if (acState != null) {
|
||||
// 🔥 增强兼容性:尝试多种数据格式(int、string等)
|
||||
// 🔥 增强兼容性:支持多种数据格式和更多状态值
|
||||
final acValue = acState is int ? acState : int.tryParse(acState.toString()) ?? -1;
|
||||
if (acValue == 1) {
|
||||
acStr = '开启';
|
||||
@@ -551,7 +565,6 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
acStr = '关闭';
|
||||
acColor = const Color(0xFF86909C);
|
||||
} else if (acValue == 2) {
|
||||
// 部分设备使用 2 表示待机或其他状态
|
||||
acStr = '待机';
|
||||
acColor = const Color(0xFFFF7D00);
|
||||
}
|
||||
|
||||
@@ -1290,12 +1290,13 @@ class _DroneVideoControlPageState extends State<DroneVideoControlPage> {
|
||||
),
|
||||
),
|
||||
children: [
|
||||
// 高德地图瓦片(最底层)
|
||||
// ESRI World Imagery(WGS84 坐标系,全球高清卫星图)
|
||||
// 替代高德地图(GCJ02),统一坐标系,无需坐标转换
|
||||
TileLayer(
|
||||
urlTemplate:
|
||||
'https://webst0{s}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
|
||||
subdomains: ['1', '2', '3', '4'],
|
||||
urlTemplate: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||
userAgentPackageName: 'com.example.app',
|
||||
minZoom: 0,
|
||||
maxZoom: 19,
|
||||
),
|
||||
|
||||
// 🔥 轨迹线(中间层)
|
||||
@@ -1563,12 +1564,13 @@ class _DroneVideoControlPageState extends State<DroneVideoControlPage> {
|
||||
),
|
||||
),
|
||||
children: [
|
||||
// 高德地图瓦片(最底层)
|
||||
// ESRI World Imagery(WGS84 坐标系,全球高清卫星图)
|
||||
// 替代高德地图(GCJ02),统一坐标系,无需坐标转换
|
||||
TileLayer(
|
||||
urlTemplate:
|
||||
'https://webst0{s}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}',
|
||||
subdomains: ['1', '2', '3', '4'],
|
||||
urlTemplate: 'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
|
||||
userAgentPackageName: 'com.example.app',
|
||||
minZoom: 0,
|
||||
maxZoom: 19,
|
||||
),
|
||||
|
||||
// 🔥 轨迹线(中间层)
|
||||
|
||||
Reference in New Issue
Block a user