diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java index 9ef9c6deb1..2ebc54828d 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java @@ -1285,17 +1285,28 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec } /** - * 金旅M1顶灯控制 + * 金旅M1顶灯1控制 * - * @param switch1Cmd //0: default, 1: 开启顶灯1, 2: 关闭顶灯1 - * @param switch2Cmd //0: default, 1: 开启顶灯2, 2: 关闭顶灯2 + * @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯 * @return boolean */ @Override - public boolean sendRoboBusJinlvM1MainLampCmd(int switch1Cmd, int switch2Cmd) { + public boolean sendRoboBusJinlvM1MainLamp1Cmd(int switchCmd) { return sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd.newBuilder() - .setMainLamp1Cmd(switch1Cmd) - .setMainLamp2Cmd(switch2Cmd) + .setMainLamp1Cmd(switchCmd) + .build()); + } + + /** + * 金旅M1顶灯2控制 + * + * @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯 + * @return boolean + */ + @Override + public boolean sendRoboBusJinlvM1MainLamp2Cmd(int switchCmd) { + return sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd.newBuilder() + .setMainLamp2Cmd(switchCmd) .build()); } diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java index 463223afc8..74bb199b85 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java @@ -663,21 +663,31 @@ public class AdasManager implements IAdasNetCommApi { } /** - * 金旅M1顶灯控制 + * 金旅M1顶灯1控制 * - * @param switch1Cmd //0: default, 1: 开启顶灯1, 2: 关闭顶灯1 - * @param switch2Cmd //0: default, 1: 开启顶灯2, 2: 关闭顶灯2 + * @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯 * @return boolean */ @Override - public boolean sendRoboBusJinlvM1MainLampCmd(int switch1Cmd, int switch2Cmd) { - return mChannel != null && mChannel.sendRoboBusJinlvM1MainLampCmd(switch1Cmd, switch2Cmd); + public boolean sendRoboBusJinlvM1MainLamp1Cmd(int switchCmd) { + return mChannel != null && mChannel.sendRoboBusJinlvM1MainLamp1Cmd(switchCmd); } /** - * 金旅M1车门控制 + * 金旅M1顶灯2控制 * - * @param switchCmd //0: default, 1: 开启车门, 2: 关闭车门 + * @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯 + * @return boolean + */ + @Override + public boolean sendRoboBusJinlvM1MainLamp2Cmd(int switchCmd) { + return mChannel != null && mChannel.sendRoboBusJinlvM1MainLamp2Cmd(switchCmd); + } + + /** + * 金旅M1小灯(氛围灯)控制 + * + * @param switchCmd //0: default, 1: 开启小灯(氛围灯), 2: 关闭小灯(氛围灯) * @return boolean */ @Override diff --git a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java index 74fc34769a..2eddd3c226 100644 --- a/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java +++ b/libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java @@ -366,13 +366,20 @@ public interface IAdasNetCommApi { boolean sendRoboBusJinlvM1HeaderCmd(int switchCmd, int windSpeedCmd); /** - * 金旅M1顶灯控制 + * 金旅M1顶灯1控制 * - * @param switch1Cmd //0: default, 1: 开启顶灯1, 2: 关闭顶灯1 - * @param switch2Cmd //0: default, 1: 开启顶灯2, 2: 关闭顶灯2 + * @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯 * @return boolean */ - boolean sendRoboBusJinlvM1MainLampCmd(int switch1Cmd, int switch2Cmd); + boolean sendRoboBusJinlvM1MainLamp1Cmd(int switchCmd); + + /** + * 金旅M1顶灯2控制 + * + * @param switchCmd //0: default, 1: 开启顶灯, 2: 关闭顶灯 + * @return boolean + */ + boolean sendRoboBusJinlvM1MainLamp2Cmd(int switchCmd); /** * 金旅M1小灯(氛围灯)控制