From e39dd0a539bc6886965fba38876739f2b81269b1 Mon Sep 17 00:00:00 2001 From: joylink_zhangsai <1021828630@qq.com> Date: Fri, 27 May 2022 11:25:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E8=AF=86=E5=88=AB=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=99=BE=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../joylink/rtss/services/voice/VoiceTrainingService.java | 2 +- .../cbtc/conversation/ConversationManagerService.java | 2 +- .../simulation/cbtc/data/vr/ControllableVrDevice.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/club/joylink/rtss/services/voice/VoiceTrainingService.java b/src/main/java/club/joylink/rtss/services/voice/VoiceTrainingService.java index 1c6957c99..c003a3734 100644 --- a/src/main/java/club/joylink/rtss/services/voice/VoiceTrainingService.java +++ b/src/main/java/club/joylink/rtss/services/voice/VoiceTrainingService.java @@ -24,7 +24,7 @@ public class VoiceTrainingService implements IVoiceTrainingService { private CompetitionErrorSetDAO competitionErrorSetDAO; @Autowired - @Qualifier("XunFeiVoiceService") + @Qualifier("baiDuVoiceService") private IVoiceService iVoiceService; @Autowired diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/conversation/ConversationManagerService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/conversation/ConversationManagerService.java index 91e083e63..e96fb6953 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/conversation/ConversationManagerService.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/conversation/ConversationManagerService.java @@ -35,7 +35,7 @@ public class ConversationManagerService { private GroupSimulationCache groupSimulationCache; @Autowired - @Qualifier("XunFeiVoiceService") + @Qualifier("baiDuVoiceService") private IVoiceService iVoiceService; @Autowired diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/ControllableVrDevice.java b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/ControllableVrDevice.java index ac9b332e8..535c39cba 100644 --- a/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/ControllableVrDevice.java +++ b/src/main/java/club/joylink/rtss/simulation/cbtc/data/vr/ControllableVrDevice.java @@ -37,12 +37,12 @@ public abstract class ControllableVrDevice extends VirtualRealityDevice { } public boolean control(C command) { - if (this.command != null && this.command.equals(command)) { //相同指令 + if (this.command == null) return false; - } - if (!this.checkConditionBeforeControl(command)) { //是否符合条件 + if (this.command.equals(command)) //相同指令 + return false; + if (!this.checkConditionBeforeControl(command)) //是否符合条件 return false; - } this.command = command; this.remain = this.turnTime; return true;