1111合并

lib/views/monitoring/index/cubit/monitoring_index_cubit.dart

@@ -39,11 +39,8 @@ class MonitoringIndexCubit extends HydratedCubit<MonitoringIndexState> {
   StreamSubscription<BluetoothDataPacket>? _bluetoothDataSub;
   StreamSubscription<BluetoothReadInfoChangedEvent>? _bluetoothReadInfoSub;
   StreamSubscription<McuReportChangedEvent>? _mcuReportChangedSub;
-<<<<<<< HEAD
   StreamSubscription<DeviceSensorAlarmEvent>? _deviceAlarmSub;
-=======
   StreamSubscription<CareLevelChangedEvent>? _careLevelChangedSub;
->>>>>>> 43d33868106a647f3523e8dbd11674431c5cdc53
   StreamSubscription<LakiMqttConnectionState>? _mqttStateSub;
   StreamSubscription<LakiMqttMessage>? _mqttMessageSub;
   StreamSubscription<String>? _mqttErrorSub;
@@ -84,11 +81,8 @@ class MonitoringIndexCubit extends HydratedCubit<MonitoringIndexState> {
     _listenBluetoothState();
     _listenBluetoothReadInfo();
     _listenMcuReportChanged();
-<<<<<<< HEAD
     _listenDeviceSensorAlarm();
-=======
     _listenCareLevelChanged();
->>>>>>> 43d33868106a647f3523e8dbd11674431c5cdc53
     _loadBoundBluetoothDevice();
 
     // // todo 测试使用 待删除
@@ -1297,7 +1291,6 @@ class MonitoringIndexCubit extends HydratedCubit<MonitoringIndexState> {
   /// 摄像头告警：通过 MQTT camera/{SN}/up 上行处理结果，并从列表中移除。
   void markAlertAsProcessed(AlertInfoBO alert) {
     if (isClosed) return;
-<<<<<<< HEAD
     if (alert.isDeviceAlarm) {
       // 设备告警：不上行 MQTT，仅移除
       final removedAlerts =
@@ -1319,17 +1312,6 @@ class MonitoringIndexCubit extends HydratedCubit<MonitoringIndexState> {
         clearSelectedAlert: true,
       ));
     }
-=======
-    _publishCameraAlarmResult(alert, 'handled');
-    final removedCameraAlerts =
-        state.cameraAlerts.where((item) => item != alert).toList();
-    final removedAlerts = state.alerts.where((item) => item != alert).toList();
-    emit(state.copyWith(
-      cameraAlerts: removedCameraAlerts,
-      alerts: removedAlerts,
-      selectedAlert: null,
-    ));
->>>>>>> 43d33868106a647f3523e8dbd11674431c5cdc53
   }
 
   /// 标记告警为误报
@@ -1338,7 +1320,6 @@ class MonitoringIndexCubit extends HydratedCubit<MonitoringIndexState> {
   /// 摄像头告警：通过 MQTT camera/{SN}/up 上行处理结果，并从列表中移除。
   void markAlertAsFalse(AlertInfoBO alert) {
     if (isClosed) return;
-<<<<<<< HEAD
     if (alert.isDeviceAlarm) {
       // 设备告警：不上行 MQTT，仅移除
       final removedAlerts =
@@ -1360,17 +1341,6 @@ class MonitoringIndexCubit extends HydratedCubit<MonitoringIndexState> {
         clearSelectedAlert: true,
       ));
     }
-=======
-    _publishCameraAlarmResult(alert, 'false_alarm');
-    final removedCameraAlerts =
-        state.cameraAlerts.where((item) => item != alert).toList();
-    final removedAlerts = state.alerts.where((item) => item != alert).toList();
-    emit(state.copyWith(
-      cameraAlerts: removedCameraAlerts,
-      alerts: removedAlerts,
-      selectedAlert: null,
-    ));
->>>>>>> 43d33868106a647f3523e8dbd11674431c5cdc53
   }
 
   /// 上行 MQTT camera/{SN}/up 告警处理结果
@@ -1408,11 +1378,8 @@ class MonitoringIndexCubit extends HydratedCubit<MonitoringIndexState> {
     _bluetoothDataSub?.cancel();
     _bluetoothReadInfoSub?.cancel();
     _mcuReportChangedSub?.cancel();
-<<<<<<< HEAD
     _deviceAlarmSub?.cancel();
-=======
     _careLevelChangedSub?.cancel();
->>>>>>> 43d33868106a647f3523e8dbd11674431c5cdc53
     _webrtcService.dispose();
     _p2pVideoService.dispose();
     return _disposeMqttClient().then((_) => super.close());