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

Merge remote-tracking branch 'origin/dev_minibus-d_230425_3.2.0' into dev_minibus-d_230425_3.2.0

Browse Source
This commit is contained in:
wangmingjun
2023-06-02 18:20:02 +08:00
parent 59bb933ff6 e8a8f295f7
commit ee2850885f
16 changed files with 230 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
View File

@@ -466,10 +466,6 @@ public class BusPassengerModel {
if (autopilotStatusInfo == null) return;
int state = autopilotStatusInfo.getState();
if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
//2022.7.20 自动驾驶更换成带档位的
if(state != mPreAutoStatus && null != routesResult){
CallerAutoPilotControlManager.INSTANCE.getGlobalPath();
}
if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning();
} else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
if(state != mPreAutoStatus){

13
OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/model/CharterPassengerModel.kt
View File

@@ -238,19 +238,6 @@ object CharterPassengerModel {
mAutoStatusChnageListener.forEach {
it.value.onAutoStatusChange(state)
}
when (state) {
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING -> {
RxUtils.createSubscribe {
cleanRoutePoints()
CallerLogger.d(M_BUS_P + TAG,"请求底盘轨迹")
CallerAutoPilotControlManager.getGlobalPath()
}
}
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE -> {}
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE -> {}
IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING -> {}
else -> {}
}
}
}
override fun onAutopilotArriveAtStation(arrivalNotification: MessagePad.ArrivalNotification?) {

7
OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt
View File

@@ -305,9 +305,6 @@ class PM2DrivingModel private constructor() {
}else{//自驾状态 2
mAutoStatusCallback?.updateAutoStatus(true)
if (routesResult != null){
CallerAutoPilotControlManager.getGlobalPath()
}
}
mCurrentAutoStatus = status
}
@@ -502,10 +499,6 @@ class PM2DrivingModel private constructor() {
}
fun dynamicCalculateRouteInfo(){
//如果轨迹点为空发送一次获取轨迹指令
if (mRoutePoints.size == 0){
CallerAutoPilotControlManager.getGlobalPath()
}
//计算当前位置和下一站的剩余点集合
//计算剩余点总里程和时间
d(SceneConstant.M_BUS_P + TAG, "och-rotting==mTwoStationsRouts.size() = " + mTwoStationsRouts.size)

2
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
View File

@@ -531,8 +531,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
// 当高频返回autopilot 2时，不重复调用订单状态变更
mPrevAPStatus = state; // 每个状态单独赋值，解决无订单时已经是2的状态导致的新订单来时无法进入此逻辑更新状态
startServicePilotDone();
CallerAutoPilotControlManager.INSTANCE.getGlobalPath();
}
} else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) {
mPrevAPStatus = state;