yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[pb10][金旅M1][电池状态回调]新增金旅M1控制命令和m1状态回调接口,以及电池状态接口

Browse Source
This commit is contained in:
xinfengkun
2023-01-11 19:27:02 +08:00
parent 60349f8d33
commit bceea30a52
13 changed files with 435 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasChannel.java
View File

@@ -1207,6 +1207,95 @@ public class AdasChannel implements IAdasNetCommApi, FpgaSocket.IWebSocketConnec
return sendSpecialVehicleTaskCmd(cmdBuild);
}
/**
* 金旅M1空调控制
*
* @param switchCmd 0: default, 1: 开启空调, 2: 关闭空调
* @param modeCmd 模式 0: default, 1: 自动模式, 2: 制冷模式, 3: 通风模式（仅送风，无温度）
* @param windSpeedCmd 风速 0: default, 1: 1档，2: 2档，3:3档
* @param temperatureCmd 温度 0: default, 16-26: 温度
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1AirConditionerCmd(int switchCmd, int modeCmd, int windSpeedCmd, int temperatureCmd) {
return sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd.newBuilder()
.setAirConditionerCmd(switchCmd)
.setAirConditionerModeCmd(modeCmd)
.setAirConditionerWindSpeedCmd(windSpeedCmd)
.setAirConditionerTemperatureCmd(temperatureCmd)
.build());
}
/**
* 金旅M1暖风机控制
*
* @param switchCmd //0: default, 1: 开启暖风机, 2: 关闭暖风机
* @param windSpeedCmd //风速 0: default, 1: 1档，2: 2档
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1HeaderCmd(int switchCmd, int windSpeedCmd) {
return sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd.newBuilder()
.setHeaderCmd(switchCmd)
.setHeaderWindSpeedCmd(windSpeedCmd)
.build());
}
/**
* 金旅M1顶灯控制
*
* @param switch1Cmd //0: default, 1: 开启顶灯1, 2: 关闭顶灯1
* @param switch2Cmd //0: default, 1: 开启顶灯2, 2: 关闭顶灯2
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1MainLampCmd(int switch1Cmd, int switch2Cmd) {
return sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd.newBuilder()
.setMainLamp1Cmd(switch1Cmd)
.setMainLamp2Cmd(switch2Cmd)
.build());
}
/**
* 金旅M1小灯(氛围灯)控制
*
* @param switchCmd //0: default, 1: 开启小灯(氛围灯), 2: 关闭小灯(氛围灯)
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1SmallLampCmd(int switchCmd) {
return sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd.newBuilder()
.setSmallLampCmd(switchCmd)
.build());
}
/**
* 金旅M1车门控制
*
* @param switchCmd //0: default, 1: 开启车门, 2: 关闭车门
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1FrontDoorCmd(int switchCmd) {
return sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd.newBuilder()
.setFrontDoorCmd(switchCmd)
.build());
}
/**
* 金旅M1业务指令下发
*
* @param roboBusJinlvM1Cmd 命令
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd roboBusJinlvM1Cmd) {
SpecialVehicleTaskCmdOuterClass.SpecialVehicleTaskCmd.Builder cmdBuild = SpecialVehicleTaskCmdOuterClass.SpecialVehicleTaskCmd
.newBuilder()
.setRoboBusJinlvM1Cmd(roboBusJinlvM1Cmd);
return sendSpecialVehicleTaskCmd(cmdBuild);
}
/**
* 特种车辆命令下发
*

71
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/AdasManager.java
View File

@@ -623,6 +623,77 @@ public class AdasManager implements IAdasNetCommApi {
return mChannel != null && mChannel.sendRoboVanSkywellTaskCmd(vanSkywellTaskCmd);
}
/**
* 金旅M1空调控制
*
* @param switchCmd 0: default, 1: 开启空调, 2: 关闭空调
* @param modeCmd 模式 0: default, 1: 自动模式, 2: 制冷模式, 3: 通风模式（仅送风，无温度）
* @param windSpeedCmd 风速 0: default, 1: 1档，2: 2档，3:3档
* @param temperatureCmd 温度 0: default, 16-26: 温度
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1AirConditionerCmd(int switchCmd, int modeCmd, int windSpeedCmd, int temperatureCmd) {
return mChannel != null && mChannel.sendRoboBusJinlvM1AirConditionerCmd(switchCmd, modeCmd, windSpeedCmd, temperatureCmd);
}
/**
* 金旅M1暖风机控制
*
* @param switchCmd //0: default, 1: 开启暖风机, 2: 关闭暖风机
* @param windSpeedCmd //风速 0: default, 1: 1档，2: 2档
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1HeaderCmd(int switchCmd, int windSpeedCmd) {
return mChannel != null && mChannel.sendRoboBusJinlvM1HeaderCmd(switchCmd, windSpeedCmd);
}
/**
* 金旅M1顶灯控制
*
* @param switch1Cmd //0: default, 1: 开启顶灯1, 2: 关闭顶灯1
* @param switch2Cmd //0: default, 1: 开启顶灯2, 2: 关闭顶灯2
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1MainLampCmd(int switch1Cmd, int switch2Cmd) {
return mChannel != null && mChannel.sendRoboBusJinlvM1MainLampCmd(switch1Cmd, switch2Cmd);
}
/**
* 金旅M1车门控制
*
* @param switchCmd //0: default, 1: 开启车门, 2: 关闭车门
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1SmallLampCmd(int switchCmd) {
return mChannel != null && mChannel.sendRoboBusJinlvM1SmallLampCmd(switchCmd);
}
/**
* 金旅M1车门控制
*
* @param switchCmd //0: default, 1: 开启车门, 2: 关闭车门
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1FrontDoorCmd(int switchCmd) {
return mChannel != null && mChannel.sendRoboBusJinlvM1FrontDoorCmd(switchCmd);
}
/**
* 金旅M1业务指令下发
*
* @param roboBusJinlvM1Cmd 命令
* @return boolean
*/
@Override
public boolean sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd roboBusJinlvM1Cmd) {
return mChannel != null && mChannel.sendRoboBusJinlvM1TaskCmd(roboBusJinlvM1Cmd);
}
/**
* 特种车辆命令下发
*

53
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/IAdasNetCommApi.java
View File

@@ -335,6 +335,59 @@ public interface IAdasNetCommApi {
*/
boolean sendRoboVanSkywellTaskCmd(SpecialVehicleTaskCmdOuterClass.RoboVanSkywellTaskCmd vanSkywellTaskCmd);
/**
* 金旅M1空调控制
*
* @param switchCmd 0: default, 1: 开启空调, 2: 关闭空调
* @param modeCmd 模式 0: default, 1: 自动模式, 2: 制冷模式, 3: 通风模式（仅送风，无温度）
* @param windSpeedCmd 风速 0: default, 1: 1档，2: 2档，3:3档
* @param temperatureCmd 温度 0: default, 16-26: 温度
* @return boolean
*/
boolean sendRoboBusJinlvM1AirConditionerCmd(int switchCmd, int modeCmd, int windSpeedCmd, int temperatureCmd);
/**
* 金旅M1暖风机控制
*
* @param switchCmd //0: default, 1: 开启暖风机, 2: 关闭暖风机
* @param windSpeedCmd //风速 0: default, 1: 1档，2: 2档
* @return boolean
*/
boolean sendRoboBusJinlvM1HeaderCmd(int switchCmd, int windSpeedCmd);
/**
* 金旅M1顶灯控制
*
* @param switch1Cmd //0: default, 1: 开启顶灯1, 2: 关闭顶灯1
* @param switch2Cmd //0: default, 1: 开启顶灯2, 2: 关闭顶灯2
* @return boolean
*/
boolean sendRoboBusJinlvM1MainLampCmd(int switch1Cmd, int switch2Cmd);
/**
* 金旅M1小灯(氛围灯)控制
*
* @param switchCmd //0: default, 1: 开启小灯(氛围灯), 2: 关闭小灯(氛围灯)
* @return boolean
*/
boolean sendRoboBusJinlvM1SmallLampCmd(int switchCmd);
/**
* 金旅M1车门控制
*
* @param switchCmd //0: default, 1: 开启车门, 2: 关闭车门
* @return boolean
*/
boolean sendRoboBusJinlvM1FrontDoorCmd(int switchCmd);
/**
* 金旅M1业务指令下发
*
* @param roboBusJinlvM1Cmd 命令
* @return boolean
*/
boolean sendRoboBusJinlvM1TaskCmd(SpecialVehicleTaskCmdOuterClass.RoboBusJinlvM1Cmd roboBusJinlvM1Cmd);
/**
* 特种车辆命令下发
*

2
libraries/mogo-adas/src/main/java/com/zhidao/support/adas/high/msg/VehicleStateMessage.java
View File

@@ -43,6 +43,8 @@ public class VehicleStateMessage extends MyAbstractMessageHandler {
* parking_brake longitude_driving_mode eps_steering_mode
* steering_sign location_missing trajectory_missing
* chassis_status_missing pilot_mode_condition_met vehicletakeoverstatus
* fuel_value robo_taxi_state robo_bus_state
* robo_bus_jinlv_m1_state
*/
private void compatibility(OnAdasListener adasListener, RawData raw, VehicleStateOuterClass.VehicleState vehicleState) throws InvalidProtocolBufferException {
/**************老地盘转换成新地盘PB***************/