diff --git a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 9e2bd8577a..5f386b5de0 100644 --- a/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-bus-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -29,6 +29,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener; import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener; import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager; @@ -59,7 +60,6 @@ import com.mogo.och.bus.passenger.network.BusPassengerServiceManager; import com.mogo.och.common.module.bean.dpmsg.AppConnectMsg; import com.mogo.och.common.module.bean.dpmsg.BaseDPMsg; import com.mogo.och.common.module.bean.dpmsg.DPMsgType; -import com.mogo.och.common.module.bean.dpmsg.LoginCacheStatus; import com.mogo.och.common.module.biz.common.socketmessage.OCHSocketMessageManager; import com.mogo.och.common.module.biz.constant.OchCommonConst; import com.mogo.och.common.module.biz.network.OchCommonServiceCallback; @@ -189,13 +189,16 @@ public class BusPassengerModel { if (routesResult != null) { routesResult = null; mNextStationIndex = 0; - startOrStopCalculateRouteInfo(false); } + startOrStopCalculateRouteInfo(false); + if (mRouteLineInfoCallback != null){ mRouteLineInfoCallback.showNoTaskView(); } + mRoutePoints.clear(); + return; } if (routesResult != null && data.getResult().equals(routesResult)){ @@ -464,6 +467,9 @@ public class BusPassengerModel { 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){ diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 5ca3230d04..b32f39aa8e 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -21,6 +21,7 @@ import com.mogo.commons.module.intent.IntentManager; import com.mogo.commons.module.status.IMogoStatusChangedListener; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.eagle.core.function.api.telematic.IReceivedMsgListener; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager; import com.mogo.eagle.core.function.call.telematic.CallerTelematicListenerManager; import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; @@ -262,7 +263,7 @@ public class BusPassengerModel { } mNextStationIndex = 0; startOrStopCalculateRouteInfo(false); - + mRoutePoints.clear(); if (mRouteLineInfoCallback != null){ mRouteLineInfoCallback.showNoTaskView(); } @@ -473,6 +474,9 @@ public class BusPassengerModel { 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){ diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index daaf6b231c..fafbe54a2a 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -531,6 +531,8 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback // 当高频返回autopilot 2时，不重复调用订单状态变更 mPrevAPStatus = state; // 每个状态单独赋值，解决无订单时已经是2的状态导致的新订单来时无法进入此逻辑更新状态 startServicePilotDone(); + + CallerAutoPilotControlManager.INSTANCE.getGlobalPath(); } } else if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE) { mPrevAPStatus = state; diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt index f19a08dcea..b8bc49e6b7 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt @@ -205,18 +205,6 @@ class DispatchAutoPilotManager private constructor() : ToastUtils.showShort("vehicleModel数据为空") return } - if(it.trajUrl_dpqp == null){ - ToastUtils.showShort("trajUrl_dpqp数据为空") - return - } - if(it.trajMd5_dpqp == null){ - ToastUtils.showShort("trajMd5_dpqp数据为空") - return - } - if(it.stopUrl_dpqp == null){ - ToastUtils.showShort("stopUrl_dpqp数据为空") - return - } if(it.lineName == null){ ToastUtils.showShort("lineName数据为空") return @@ -230,7 +218,7 @@ class DispatchAutoPilotManager private constructor() : return } val currentAutoPilotLine = AutopilotControlParameters.AutoPilotLine(it.lineId.toLong(),it.trajUrl,it.trajMd5, - it.stopUrl,it.stopMd5,it.timestamp,it.vehicleModel,it.trajUrl_dpqp,it.trajMd5_dpqp,it.stopUrl_dpqp, + it.stopUrl,it.stopMd5,it.timestamp,it.vehicleModel,it.trajUrl_dpqp+"",it.trajMd5_dpqp+"",it.stopUrl_dpqp+"", it.stopMd5_dpqp,it.timestamp_dpqp) currentAutopilot.autoPilotLine = currentAutoPilotLine currentAutopilot.routeID = it.lineId diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt index b92dd55b4c..12a53090b3 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt @@ -4,6 +4,7 @@ import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager +import com.zhidao.support.adas.high.AdasManager /** * @author xiaoyuzhou @@ -26,6 +27,8 @@ class AsyncDataToAutopilotServer private constructor() : IMoGoTrafficLightListen } override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) { - CallerAutoPilotControlManager.sendTrafficLightData(trafficLightResult) + val version = AdasManager.getInstance().mapVersion + if (version > -1 && version < 290) + CallerAutoPilotControlManager.sendTrafficLightData(trafficLightResult) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 992849ae5e..f01a19ef74 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -166,6 +166,8 @@ class AiCloudIdentifyDataManager : IMogoMapListener, super.onAutopilotRouteLineId(lineId) if (lineId == 0L) { updateRomaStyle(true) + }else{ + CallerAutoPilotControlManager.getGlobalPath() } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java index bd2fd9eecb..6da3576d2c 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java @@ -7,10 +7,12 @@ import static com.mogo.eagle.core.function.business.identify.TrackManager.LIMIT_ import android.annotation.SuppressLint; +import com.mogo.eagle.core.data.config.FunctionBuildConfig; import com.mogo.eagle.core.data.enums.TrafficTypeEnum; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.utilcode.geometry.S2CellId; import com.mogo.eagle.core.utilcode.geometry.S2LatLng; +import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils; import com.mogo.eagle.core.utilcode.util.CoordinateUtils; import com.mogo.eagle.core.utilcode.util.ParseVersionUtils; import com.zhjt.service.chain.ChainLog; @@ -55,7 +57,7 @@ public class TrackObj { if (dockerVersion != null && !dockerVersion.isEmpty()) { try { int version = ParseVersionUtils.parseVersion(true, dockerVersion); - if (version >= 310) { + if (version >= 310 && AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) { return; } } catch (Exception e) { diff --git a/gradle.properties b/gradle.properties index eb690d7c56..808ba62f5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,23 +66,23 @@ SERVICE_BIZ_VERSION=1.2.4 LOGLIB_VERSION=1.5.27 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION -MOGO_NETWORK_VERSION=1.4.7.3 +MOGO_NETWORK_VERSION=1.4.7.4 # 鉴权 -MOGO_PASSPORT_VERSION=1.4.7.3 +MOGO_PASSPORT_VERSION=1.4.7.4 # 常链接 -MOGO_SOCKET_VERSION=1.4.7.3 +MOGO_SOCKET_VERSION=1.4.7.4 # 数据采集 -MOGO_REALTIME_VERSION=1.4.7.3 +MOGO_REALTIME_VERSION=1.4.7.4 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.4.7.3 +MOGO_TANLU_VERSION=1.4.7.4 # 直播推流 -MOGO_LIVE_VERSION=1.4.7.3 +MOGO_LIVE_VERSION=1.4.7.4 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.4.7.3 +MOGO_TRAFFICLIVE_VERSION=1.4.7.4 # 定位服务 -MOGO_LOCATION_VERSION=1.4.7.3 +MOGO_LOCATION_VERSION=1.4.7.4 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.4.7.3 +MOGO_TELEMATIC_VERSION=1.4.7.4 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.12.1.1 diff --git a/libraries/mogo-adas/build.gradle b/libraries/mogo-adas/build.gradle index 5710f48d1e..76ddc296a8 100644 --- a/libraries/mogo-adas/build.gradle +++ b/libraries/mogo-adas/build.gradle @@ -66,6 +66,10 @@ android { abortOnError false } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } 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 8732af2ce3..adf028f7a9 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 @@ -42,6 +42,7 @@ public class AdasManager implements IAdasNetCommApi { */ private static final int PROTOCOL_VERSION = MessagePad.ProtocolVersion.CurrentVersion.getNumber(); private volatile MessagePad.CarConfigResp carConfig; + private int mapVersion = -1;//当前连接的MAP版本，断开连接会置为-1 private static final String ADAS_VERSION = BuildConfig.VERSION_NAME; private final Pattern pattern = Pattern.compile("\\d+\\.\\d+\\.\\d+"); @@ -64,6 +65,20 @@ public class AdasManager implements IAdasNetCommApi { public synchronized void setCarConfig(MessagePad.CarConfigResp carConfig) { this.carConfig = carConfig; + if (carConfig != null) { + mapVersion = parseVersion(carConfig.getDockVersion()); + } else { + mapVersion = -1; + } + } + + /** + * 当前连接的MAP版本，断开连接会置为-1 + * + * @return 版本 + */ + public int getMapVersion() { + return mapVersion; } /**