and so on
This commit is contained in:
@@ -28,6 +28,7 @@ import '../../domain/entities/drone_station_entity.dart'; // 🔥 添加 DroneSt
|
||||
import 'robot_list_page.dart';
|
||||
import 'robot_control_page.dart';
|
||||
import 'drone_station_detail_page.dart';
|
||||
import '../../../../../core/network/mqtt/data/datasources/drone_osd_datasource.dart';
|
||||
import 'qr_scanner_page.dart';
|
||||
import 'bind_device_page.dart';
|
||||
import '../../../../remote_control/presentation/bloc/remote_control_cubit.dart';
|
||||
@@ -756,6 +757,12 @@ class _DeviceStatusViewState extends State<DeviceStatusView> {
|
||||
return DroneStationItemCard(
|
||||
station: station,
|
||||
onTap: () {
|
||||
// 预启动 OSD 订阅:进入详情页前就让 MQTT 数据流跑起来
|
||||
// 这样详情页一进来就能从 stream 读到数据,无需等待首帧推送
|
||||
sl<DroneOsdDataSource>().startListening(
|
||||
deviceSn: station.deviceSn,
|
||||
gatewaySn: station.gatewaySn,
|
||||
);
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
@@ -936,7 +943,8 @@ class _DeviceStatusViewState extends State<DeviceStatusView> {
|
||||
if (result != null && mounted) {
|
||||
Navigator.of(context).push(
|
||||
MaterialPageRoute(
|
||||
builder: (_) => BindDevicePage(scanResult: result),
|
||||
builder: (_) =>
|
||||
BindDevicePage(scanResult: result),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -1129,6 +1137,11 @@ class _DeviceStatusViewState extends State<DeviceStatusView> {
|
||||
}
|
||||
|
||||
if (matchedStation != null) {
|
||||
// 预启动 OSD 订阅:进入详情页前就让 MQTT 数据流跑起来
|
||||
sl<DroneOsdDataSource>().startListening(
|
||||
deviceSn: matchedStation.deviceSn,
|
||||
gatewaySn: matchedStation.gatewaySn,
|
||||
);
|
||||
Navigator.push(
|
||||
context,
|
||||
MaterialPageRoute(
|
||||
|
||||
@@ -37,18 +37,22 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
late DroneOsdDataSource _osdDataSource;
|
||||
StreamSubscription<DroneOsdEntity>? _stationOsdSubscription;
|
||||
|
||||
/// 静态缓存:跨页面实例保留上次的 host 数据
|
||||
static final Map<String, dynamic> _cachedHostData = {};
|
||||
/// 静态缓存:按 gatewaySn 分区,跨页面实例保留每个机场上次的 host 数据
|
||||
/// 避免进入新机场时显示上一个机场的缓存数据
|
||||
static final Map<String, Map<String, dynamic>> _cachedHostDataBySn = {};
|
||||
|
||||
final ValueNotifier<Map<String, dynamic>> _stationHostData =
|
||||
ValueNotifier<Map<String, dynamic>>(
|
||||
// 初始化时从缓存加载,进入页面立即显示
|
||||
Map<String, dynamic>.from(_cachedHostData),
|
||||
);
|
||||
ValueNotifier<Map<String, dynamic>>({});
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
// 进入页面时加载当前机场的缓存数据(切回时立即显示)
|
||||
final cached = _cachedHostDataBySn[widget.station.gatewaySn];
|
||||
if (cached != null && cached.isNotEmpty) {
|
||||
_stationHostData.value = Map<String, dynamic>.from(cached);
|
||||
}
|
||||
|
||||
_bloc = sl<DroneStationBloc>();
|
||||
_bloc.add(
|
||||
UAVDetailLoad(
|
||||
@@ -64,8 +68,10 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
}
|
||||
|
||||
void _startStationOsdListening() {
|
||||
// 使用 station 自带的 deviceSn + gatewaySn,与列表页预订阅参数一致
|
||||
// 避免因参数不同导致 DataSource 重新订阅、打断数据流
|
||||
_osdDataSource.startListening(
|
||||
deviceSn: '',
|
||||
deviceSn: widget.station.deviceSn,
|
||||
gatewaySn: widget.station.gatewaySn,
|
||||
);
|
||||
|
||||
@@ -76,18 +82,32 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
}
|
||||
|
||||
void _parseAndUpdateHostData(DroneOsdEntity osd) {
|
||||
// 防护:验证消息来源 SN 是否匹配当前机场,避免串台
|
||||
final sourceSn = osd.rawData['_sourceSn'];
|
||||
if (sourceSn != null && sourceSn != widget.station.gatewaySn) {
|
||||
debugPrint(
|
||||
'⚠️ [DetailPage] 丢弃非当前机场 OSD: source=$sourceSn, current=${widget.station.gatewaySn}',
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
final data = osd.rawData;
|
||||
final hostData = data['data'] is Map ? (data['data'] as Map)['host'] : null;
|
||||
if (hostData == null || hostData is! Map) return;
|
||||
|
||||
// 🔥 基于已有数据合并,只更新非 null 字段,避免 Type 2 消息覆盖已有值
|
||||
final Map<String, dynamic> merged = Map<String, dynamic>.from(_stationHostData.value);
|
||||
final Map<String, dynamic> merged = Map<String, dynamic>.from(
|
||||
_stationHostData.value,
|
||||
);
|
||||
|
||||
void _put(String key, dynamic value) {
|
||||
if (value != null) merged[key] = value;
|
||||
}
|
||||
|
||||
_put('environment_temperature', (hostData['environment_temperature'] as num?)?.toDouble());
|
||||
_put(
|
||||
'environment_temperature',
|
||||
(hostData['environment_temperature'] as num?)?.toDouble(),
|
||||
);
|
||||
_put('humidity', (hostData['humidity'] as num?)?.toDouble());
|
||||
_put('wind_speed', (hostData['wind_speed'] as num?)?.toDouble());
|
||||
_put('rainfall', hostData['rainfall']?.toString());
|
||||
@@ -95,7 +115,10 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
_put('drone_in_dock', hostData['drone_in_dock']?.toString());
|
||||
_put('temperature', (hostData['temperature'] as num?)?.toDouble());
|
||||
_put('putter_state', hostData['putter_state']?.toString());
|
||||
_put('supplement_light_state', hostData['supplement_light_state']?.toString());
|
||||
_put(
|
||||
'supplement_light_state',
|
||||
hostData['supplement_light_state']?.toString(),
|
||||
);
|
||||
_put('alarm_state', hostData['alarm_state']?.toString());
|
||||
_put('emergency_stop_state', hostData['emergency_stop_state']?.toString());
|
||||
_put('silent_mode', hostData['silent_mode']?.toString());
|
||||
@@ -104,28 +127,42 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
_put('height', (hostData['height'] as num?)?.toDouble());
|
||||
_put('latitude', (hostData['latitude'] as num?)?.toDouble());
|
||||
_put('longitude', (hostData['longitude'] as num?)?.toDouble());
|
||||
_put('home_position_is_valid', hostData['home_position_is_valid']?.toString());
|
||||
_put(
|
||||
'home_position_is_valid',
|
||||
hostData['home_position_is_valid']?.toString(),
|
||||
);
|
||||
_put('battery_store_mode', hostData['battery_store_mode']?.toString());
|
||||
_put('first_power_on', hostData['first_power_on']?.toString());
|
||||
_put('drone_charge_state', hostData['drone_charge_state']);
|
||||
_put('air_conditioner', hostData['air_conditioner']);
|
||||
_put('network_state', hostData['network_state']);
|
||||
_put('position_state', hostData['position_state']);
|
||||
_put('storage', hostData['storage']);
|
||||
_put('sub_device', hostData['sub_device']);
|
||||
_put('alternate_land_point', hostData['alternate_land_point']);
|
||||
|
||||
if (hostData['air_conditioner'] is Map) {
|
||||
final ac = hostData['air_conditioner'] as Map;
|
||||
_put('air_conditioner_state', ac['air_conditioner_state']?.toString());
|
||||
_put('air_conditioner_switch_time', ac['switch_time']?.toString());
|
||||
// 🔥 优先处理空调信息(确保第一时间解析,避免与其他卡片显示不同步)
|
||||
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');
|
||||
}
|
||||
}
|
||||
|
||||
_stationHostData.value = merged;
|
||||
// 同步写入静态缓存
|
||||
_cachedHostData
|
||||
..clear()
|
||||
..addAll(merged);
|
||||
// 同步写入按 gatewaySn 分区的静态缓存
|
||||
_cachedHostDataBySn[widget.station.gatewaySn] = Map<String, dynamic>.from(
|
||||
merged,
|
||||
);
|
||||
}
|
||||
|
||||
/// 🔥 页面重新激活时调用(从其他页面返回时)
|
||||
@@ -161,6 +198,9 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
@override
|
||||
void dispose() {
|
||||
_stationOsdSubscription?.cancel();
|
||||
// 只调用 stopListening 减少引用计数,不调用 dispose()
|
||||
// 因为 DroneOsdDataSource 是 LazySingleton,被列表页和详情页共享
|
||||
// 详情页退出后列表页可能仍需要该订阅
|
||||
_osdDataSource.stopListening();
|
||||
_stationHostData.dispose();
|
||||
_bloc.close();
|
||||
@@ -291,11 +331,14 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
|
||||
Widget _buildContent(UAVDetailEntity detail) {
|
||||
_detail = detail;
|
||||
_droneSn = detail.deviceSn;
|
||||
final newDroneSn = detail.deviceSn;
|
||||
|
||||
if (_droneSn != null && _droneSn!.isNotEmpty) {
|
||||
// 只在 droneSn 真正变化时才重新订阅,避免 Bloc 刷新时重复 startListening
|
||||
// 导致引用计数虚增、dispose 时无法真正取消订阅
|
||||
if (newDroneSn != null && newDroneSn.isNotEmpty && newDroneSn != _droneSn) {
|
||||
_droneSn = newDroneSn;
|
||||
_osdDataSource.startListening(
|
||||
deviceSn: _droneSn!,
|
||||
deviceSn: newDroneSn,
|
||||
gatewaySn: widget.station.gatewaySn,
|
||||
);
|
||||
}
|
||||
@@ -499,13 +542,18 @@ class _DroneStationDetailPageState extends State<DroneStationDetailPage> {
|
||||
String acStr = '未知';
|
||||
Color acColor = const Color(0xFF86909C);
|
||||
if (acState != null) {
|
||||
final state = int.tryParse(acState) ?? -1;
|
||||
if (state == 1) {
|
||||
// 🔥 增强兼容性:尝试多种数据格式(int、string等)
|
||||
final acValue = acState is int ? acState : int.tryParse(acState.toString()) ?? -1;
|
||||
if (acValue == 1) {
|
||||
acStr = '开启';
|
||||
acColor = const Color(0xFF00B42A);
|
||||
} else if (state == 0) {
|
||||
} else if (acValue == 0) {
|
||||
acStr = '关闭';
|
||||
acColor = const Color(0xFF86909C);
|
||||
} else if (acValue == 2) {
|
||||
// 部分设备使用 2 表示待机或其他状态
|
||||
acStr = '待机';
|
||||
acColor = const Color(0xFFFF7D00);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user