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

合并2.13.2的obu验收相关功能

Browse Source
This commit is contained in:
lixiaopeng
2023-01-29 17:23:41 +08:00
parent a5a8157f6d
commit b60fbb2613
26 changed files with 1577 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.java
View File

@@ -22,8 +22,8 @@ public class SweeperLimitingVelocityView extends IViewLimitingVelocity {
initView(context);
}
@Override
public void updateLimitingSpeed(int limitingSpeed) {
super.updateLimitingSpeed(limitingSpeed);
public void updateLimitingSpeed(int limitingSpeed, int limitSource) {
super.updateLimitingSpeed(limitingSpeed, limitSource);
limitingVelocity.setText(String.valueOf(limitingSpeed));
}
private void initView(@NonNull Context context) {

150
OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java
View File

@@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.constraintlayout.widget.ConstraintLayout;
import chassis.Chassis;
import chassis.VehicleStateOuterClass;
//import chassis.Chassis;
//import chassis.VehicleStateOuterClass;
public class SweeperTrafficDataView extends ConstraintLayout {
private static final String TAG = "SweeperTrafficDataView";
@@ -70,84 +70,84 @@ public class SweeperTrafficDataView extends ConstraintLayout {
CallLimitingVelocityListenerManager.INSTANCE.removeListener(limitingVelocityListener);
}
private final IMoGoAutopilotVehicleStateListener mIMoGoAutopilotVehicleStateListener = new IMoGoAutopilotVehicleStateListener() {
@Override
public void onSweeperFutianCleanSystemState(@NonNull VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
}
/**
* 车辆转向灯
* @param lightSwitch
*/
@Override
public void onAutopilotLightSwitchData(@org.jetbrains.annotations.Nullable Chassis.LightSwitch lightSwitch) {
//转向灯状态 0是正常 1是左转 2是右转
if (lightSwitch != null) {
CallerLogger.INSTANCE.d(TAG, "车辆转向灯:" + lightSwitch.toString());
if (lightSwitch.getNumber()==1){
sweeperTurnSignal.showLeftSignal();
}else if(lightSwitch.getNumber()==2){
sweeperTurnSignal.showRightSignal();
}else{
sweeperTurnSignal.showDirection();
}
}
}
/**
* 刹车灯
* @param brakeLight
*/
@Override
public void onAutopilotBrakeLightData(boolean brakeLight) {
CallerLogger.INSTANCE.d(TAG, "刹车灯:" + brakeLight);
}
/**
* 方向盘转向角 左+右-
* @param steering
*/
@Override
public void onAutopilotSteeringData(float steering) {
CallerLogger.INSTANCE.d(TAG, "steering原始值====" + steering);
if (Math.abs(steering) < 1) {
steering = 0;
}
CallerLogger.INSTANCE.d(TAG, "steering忽略小数点后====" + (int) steering);
}
/**
* 档位
* @param gear
*/
@Override
public void onAutopilotGearData(@NotNull Chassis.GearPosition gear) {
CallerLogger.INSTANCE.d(TAG, "司机屏档位" + gear.toString());
ThreadUtils.runOnUiThread(() -> {
if (tapPositionView != null) {
tapPositionView.updateWithGear(gear);
}
});
}
// @Override
// public void onSweeperFutianCleanSystemState(@NonNull VehicleStateOuterClass.SweeperFuTianCleanSystemState cleanSystemState) {
// }
//
// /**
// * 车辆转向灯
// * @param lightSwitch
// */
// @Override
// public void onAutopilotLightSwitchData(@org.jetbrains.annotations.Nullable Chassis.LightSwitch lightSwitch) {
// //转向灯状态 0是正常 1是左转 2是右转
// if (lightSwitch != null) {
// CallerLogger.INSTANCE.d(TAG, "车辆转向灯:" + lightSwitch.toString());
// if (lightSwitch.getNumber()==1){
// sweeperTurnSignal.showLeftSignal();
// }else if(lightSwitch.getNumber()==2){
// sweeperTurnSignal.showRightSignal();
// }else{
// sweeperTurnSignal.showDirection();
// }
// }
// }
//
// /**
// * 刹车灯
// * @param brakeLight
// */
// @Override
// public void onAutopilotBrakeLightData(boolean brakeLight) {
// CallerLogger.INSTANCE.d(TAG, "刹车灯:" + brakeLight);
// }
//
// /**
// * 方向盘转向角 左+右-
// * @param steering
// */
// @Override
// public void onAutopilotSteeringData(float steering) {
// CallerLogger.INSTANCE.d(TAG, "steering原始值====" + steering);
// if (Math.abs(steering) < 1) {
// steering = 0;
// }
// CallerLogger.INSTANCE.d(TAG, "steering忽略小数点后====" + (int) steering);
// }
//
// /**
// * 档位
// * @param gear
// */
// @Override
// public void onAutopilotGearData(@NotNull Chassis.GearPosition gear) {
// CallerLogger.INSTANCE.d(TAG, "司机屏档位" + gear.toString());
// ThreadUtils.runOnUiThread(() -> {
// if (tapPositionView != null) {
// tapPositionView.updateWithGear(gear);
// }
// });
// }
@Override
public void onAutopilotDataException(long timestamp) {
}
@Override
public void onAutopilotAcc(float carAcc) {
}
@Override
public void onAutopilotBrake(float brake) {
CallerLogger.INSTANCE.d(TAG, "刹车:" + brake);
}
@Override
public void onAutopilotThrottle(float throttle) {
CallerLogger.INSTANCE.d(TAG, "油门:" + throttle);
}
// @Override
// public void onAutopilotAcc(float carAcc) {
//
// }
//
// @Override
// public void onAutopilotBrake(float brake) {
// CallerLogger.INSTANCE.d(TAG, "刹车:" + brake);
// }
//
// @Override
// public void onAutopilotThrottle(float throttle) {
// CallerLogger.INSTANCE.d(TAG, "油门:" + throttle);
// }
};
/**
@@ -158,7 +158,7 @@ public class SweeperTrafficDataView extends ConstraintLayout {
@Override
public void onLimitingVelocityChange(int limitingVelocity) {
//设置限速
sweeperLimitingVelocity.updateLimitingSpeed(limitingVelocity);
sweeperLimitingVelocity.updateLimitingSpeed(limitingVelocity, 0); //此处小兵合并下
}
};
/**