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

Merge branch 'dev_minibus-d_230425_3.2.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_minibus-d_230425_3.2.0

Browse Source
This commit is contained in:
lixiaopeng
2023-05-19 16:38:05 +08:00
parent 953eddac99 da88465904
commit 7df412f8f8
10 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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){

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

@@ -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){

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

@@ -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;

14
core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt
View File

@@ -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

5
core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/server/AsyncDataToAutopilotServer.kt
View File

@@ -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)
}
}

2
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt
View File

@@ -166,6 +166,8 @@ class AiCloudIdentifyDataManager : IMogoMapListener,
super.onAutopilotRouteLineId(lineId)
if (lineId == 0L) {
updateRomaStyle(true)
}else{
CallerAutoPilotControlManager.getGlobalPath()
}
}

4
core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackObj.java
View File

@@ -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) {

18
gradle.properties
View File

@@ -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

4
libraries/mogo-adas/build.gradle
View File

@@ -66,6 +66,10 @@ android {
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

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

@@ -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;
}
/**