From d501d08e5e906554cef98344d88b8f692b2f2ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Wed, 11 Jun 2025 11:28:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgs/app/service/device/DeviceInitService.java | 55 ++++++++++++---------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java b/src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java index 2f4a739..2bd48ee 100644 --- a/src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java +++ b/src/main/java/com/iflytop/sgs/app/service/device/DeviceInitService.java @@ -17,6 +17,7 @@ import com.iflytop.sgs.common.enums.cmd.CmdColor; import com.iflytop.sgs.common.service.CanBusService; import com.iflytop.sgs.hardware.exception.HardwareException; import com.iflytop.sgs.hardware.service.AppEventBusService; +import com.iflytop.sgs.hardware.type.appevent.A8kCanBusOnConnectEvent; import com.iflytop.sgs.hardware.type.appevent.AppEvent; import jakarta.annotation.PostConstruct; import lombok.RequiredArgsConstructor; @@ -48,32 +49,34 @@ public class DeviceInitService { } private void onAppEvent(AppEvent event) { - new Thread(() -> { - try { - CompletableFuture.runAsync(() -> { - try { - deviceLightSoundService.openColor(CmdColor.blue); - } catch (HardwareException e) { - log.error("设备初始化灯光失败,CmdColor.blue"); - } - }); - initDeviceState(); - initDeviceSetData(); - canBusService.initOvertime(); - initEnable(); - initSensorState(); - CompletableFuture.runAsync(() -> { - try { - deviceLightSoundService.openColor(CmdColor.green); - } catch (HardwareException e) { - log.error("设备初始化灯光失败,CmdColor.green"); - } - }); - deviceStateService.getDeviceState().setInitComplete(true); - } catch (Exception e) { - log.error("设备初始化失败", e); - } - }).start(); + if(event instanceof A8kCanBusOnConnectEvent){ + new Thread(() -> { + try { + CompletableFuture.runAsync(() -> { + try { + deviceLightSoundService.openColor(CmdColor.blue); + } catch (HardwareException e) { + log.error("设备初始化灯光失败,CmdColor.blue"); + } + }); + initDeviceState(); + initDeviceSetData(); + canBusService.initOvertime(); + initEnable(); + initSensorState(); + CompletableFuture.runAsync(() -> { + try { + deviceLightSoundService.openColor(CmdColor.green); + } catch (HardwareException e) { + log.error("设备初始化灯光失败,CmdColor.green"); + } + }); + deviceStateService.getDeviceState().setInitComplete(true); + } catch (Exception e) { + log.error("设备初始化失败", e); + } + }).start(); + } } public void initSensorState() throws Exception {