diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt index 52172f5177..13547d9ade 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt @@ -206,7 +206,7 @@ class MoGoAutopilotProvider : } override fun sendMessageToAutopilot(jsonString: String) { - AdasManager.getInstance().sendMessage(jsonString) +// AdasManager.getInstance().sendMessage(jsonString) //todo pb : 红绿灯 } override fun cancelAutoPilot() { diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java deleted file mode 100644 index 6ef974aa82..0000000000 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasListenerImpl.java +++ /dev/null @@ -1,365 +0,0 @@ -package com.mogo.eagle.core.function.autopilot.adapter; - -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_ADAS; -import static com.mogo.eagle.core.data.deva.chain.ChainConstant.CHAIN_LINK_LOG_WEB_SOCKET_DATA; - -import androidx.annotation.Nullable; - -import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo; -import com.mogo.eagle.core.data.autopilot.AutoPilotRecordResult; -import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotStationInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo; -import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage; -import com.mogo.eagle.core.data.config.HdMapBuildConfig; -import com.mogo.eagle.core.data.traffic.TrafficData; -import com.mogo.eagle.core.function.autopilot.utils.AdasObjectConvertUtils; -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; -import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarStatusListenerManager; -import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager; -import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager; -import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; -import com.mogo.eagle.core.utilcode.mogo.logger.Logger; -import com.mogo.module.common.MogoApisHandler; -import com.mogo.module.common.datacenter.SnapshotLocationDataCenter; -import com.mogo.module.service.MarkerServiceHandler; -import com.zhidao.support.adas.high.AdasManager; -import com.zhidao.support.adas.high.OnAdasListener; -import com.zhidao.support.adas.high.bean.AutopilotRoute; -import com.zhidao.support.adas.high.bean.AutopilotStatus; -import com.zhidao.support.adas.high.bean.AutopilotWayArrive; -import com.zhidao.support.adas.high.bean.CarLaneInfo; -import com.zhidao.support.adas.high.bean.CarStateInfo; -import com.zhidao.support.adas.high.bean.IPCUpgradeStateInfo; -import com.zhidao.support.adas.high.bean.LightStatueInfo; -import com.zhidao.support.adas.high.bean.ObstaclesInfo; -import com.zhidao.support.adas.high.bean.RectInfo; -import com.zhidao.support.adas.high.bean.SSHResult; -import com.zhidao.support.adas.high.bean.TrajectoryInfo; -import com.zhidao.support.adas.high.bean.WarnMessageInfo; -import com.zhidao.support.adas.high.bean.guardian.AutopilotGuardianInfo; -import com.zhidao.support.adas.high.bean.record.AutopilotRecordResult; -import com.zhjt.service.chain.ChainLog; -import com.zhjt.service.chain.TracingConstants; - -import org.json.JSONObject; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author congtaowang - * @since 2020/10/22 - *

- * 适配ADAS 回调监听分发，这里不做业务，只做数据包装及分发处理 - */ -public class MoGoAdasListenerImpl implements OnAdasListener { - private final String TAG = "OnAdasListenerAdapter"; - - @ChainLog(linkCode = CHAIN_LINK_ADAS, - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_RECT_DATA, - paramIndexes = {0}, - clientPkFileName = "sn") - @Override - public void onRectData(RectInfo rectInfo) { - if (HdMapBuildConfig.isMapLoaded) { - ArrayList recognizedListResults = AdasObjectConvertUtils.INSTANCE.regroupTrafficDataData(rectInfo.getModels()); - CallerAutopilotIdentifyListenerManager.INSTANCE.invokeAutopilotIdentifyDataUpdate(recognizedListResults); - } - } - - @ChainLog(linkCode = CHAIN_LINK_ADAS, - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_CAR_STATE, - paramIndexes = {0}, - clientPkFileName = "sn") - @Override - public void onCarStateData(CarStateInfo carStateInfo) { - if (HdMapBuildConfig.isMapLoaded) { -// Logger.d(TAG, "--------carStateInfo.toString() = " + carStateInfo.toString()); - AutopilotCarStateInfo autopilotCarStateInfo = AdasObjectConvertUtils.INSTANCE.fromAdasCarStateInfoObject(carStateInfo); - // 将数据通过数据中心分发出去 - CallerAutopilotCarStatusListenerManager.INSTANCE.invokeAutopilotCarStateData(autopilotCarStateInfo); - // 同步给MAP地图 - adasCarDataCallback(autopilotCarStateInfo); - } - } - - - public void adasCarDataCallback(@Nullable AutopilotCarStateInfo stateInfo) { - - if (stateInfo != null && stateInfo.getValues() != null) { - //Logger.d(TAG,"同步自车数据给地图……"); - - MogoApisHandler.getInstance().getApis().getAdasControllerApi().setLastLat(stateInfo.getValues().getLat()); - MogoApisHandler.getInstance().getApis().getAdasControllerApi().setLastLon(stateInfo.getValues().getLon()); - MogoApisHandler.getInstance().getApis().getAdasControllerApi().setSatelliteTime(stateInfo.getValues().getSatelliteTime()); - JSONObject data = new JSONObject(); - try { - data.putOpt("lon", stateInfo.getValues().getLon()); - data.putOpt("lat", stateInfo.getValues().getLat()); - data.putOpt("alt", stateInfo.getValues().getAlt()); - data.putOpt("speed", stateInfo.getValues().getGnss_speed()); - data.putOpt("heading", stateInfo.getValues().getHeading()); - data.putOpt("acceleration", stateInfo.getValues().getAcceleration()); - data.putOpt("yawRate", stateInfo.getValues().getYaw_rate()); - data.putOpt("gpsProvider", 1); - try { - data.putOpt("systemTime", Long.parseLong(stateInfo.getValues().getSystemTime())); - } catch (Exception e) { -// e.printStackTrace(); - } - try { - data.putOpt("satelliteTime", Long.parseLong(stateInfo.getValues().getSatelliteTime())); - } catch (Exception e) { - e.printStackTrace(); - } - try { - data.putOpt("receiverDataTime", Long.parseLong(stateInfo.getValues().getReceiverDataTime())); - } catch (Exception e) { -// e.printStackTrace(); - } - try { - data.putOpt("adasSatelliteTime", Long.parseLong(stateInfo.getValues().getAdasSatelliteTime())); - } catch (Exception e) { -// e.printStackTrace(); - } - MarkerServiceHandler.getApis().getMapServiceApi().getMapUIController().syncLocation2Map(data); - SnapshotLocationDataCenter.getInstance().syncAdasLocationInfo(data); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - @ChainLog(linkCode = CHAIN_LINK_ADAS, - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_STATUS, - paramIndexes = {0}, - clientPkFileName = "sn") - @Override - public void autopilotStatus(AutopilotStatus autopilotStatus) { - if (HdMapBuildConfig.isMapLoaded) { - AutopilotStatus.ValuesBean autopilotStatusValues = autopilotStatus.getValues(); - - if (autopilotStatusValues != null) { - // 初始化自动驾驶状态信息 - AutopilotStatusInfo autopilotStatusInfo = CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo(); - autopilotStatusInfo.setState(autopilotStatusValues.getState()); - autopilotStatusInfo.setPilotmode(autopilotStatusValues.getPilotmode()); - autopilotStatusInfo.setControl_pilotmode(autopilotStatusValues.getControl_pilotmode()); - autopilotStatusInfo.setReason(autopilotStatusValues.getReason()); - autopilotStatusInfo.setCamera(autopilotStatusValues.getCamera()); - autopilotStatusInfo.setRtk(autopilotStatusValues.getRtk()); - autopilotStatusInfo.setRadar(autopilotStatusValues.getRadar()); - autopilotStatusInfo.setSpeed(autopilotStatusValues.getSpeed()); - // 初始化自动驾驶状态信息 - if (autopilotStatusInfo.getVersion() == null) { - autopilotStatusInfo.setVersion(AdasManager.getInstance().getAdasConfig().getVersion()); - } - if (autopilotStatusInfo.getConnectIP() == null) { - autopilotStatusInfo.setConnectIP(AdasManager.getInstance().getAdasConfig().getAddress()); - } - if (autopilotStatusInfo.getDockVersion() == null) { - autopilotStatusInfo.setDockVersion(AdasManager.getInstance().getAdasConfig().getDockVersion()); - } - - CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutoPilotStatus(); - } - } - } - - @ChainLog(linkCode = CHAIN_LINK_ADAS, - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ARRIVE, - paramIndexes = {0}, - clientPkFileName = "sn") - @Override - public void autopilotArrive(AutopilotWayArrive autopilotWayArrive) { - if (HdMapBuildConfig.isMapLoaded) { -// Logger.d(TAG, "autopilotArrive : " + autopilotWayArrive); - if (autopilotWayArrive != null) { - AutopilotWayArrive.ResultBean result = autopilotWayArrive.getResult(); - if (result != null) { - AutopilotWayArrive.ResultBean.EndLatLonBean endLatLon = result.getEndLatLon(); - if (endLatLon != null) { - AutopilotStationInfo stationInfo = new AutopilotStationInfo(result.getCarType(), endLatLon.getLon(), endLatLon.getLat()); - - CallerAutoPilotStatusListenerManager.INSTANCE.invokeArriveAtStation(stationInfo); - } - } - } - } - } - - @ChainLog(linkCode = CHAIN_LINK_ADAS, - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_ROUTE, - paramIndexes = {0}, - clientPkFileName = "sn") - @Override - public void onAutopilotRoute(AutopilotRoute route) { - if (HdMapBuildConfig.isMapLoaded) { -// Logger.d(TAG, "onAutopilotRoute : " + route.toString()); - AutopilotRouteInfo autopilotRoute = AdasObjectConvertUtils.INSTANCE.fromAdasAutopilotRoute(route); - CallerAutopilotPlanningListenerManager.INSTANCE.invokeAutopilotRotting(autopilotRoute); - } - } - -// @ChainLog(linkCode = CHAIN_LINK_ADAS, -// endpoint = TracingConstants.Endpoint.PAD, -// nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_TRAJECTORY, -// paramIndexes = {0}, -// clientPkFileName = "sn") - @Override - public void onAutopilotTrajectory(List trajectoryList) { - if (HdMapBuildConfig.isMapLoaded) { -// Logger.d(TAG, "onAutopilotTrajectory : " + trajectoryList); - ArrayList trajectoryInfoArrayList = new ArrayList<>(); - if (trajectoryList != null && trajectoryList.size() > 0) { - for (TrajectoryInfo trajectory : trajectoryList) { - ADASTrajectoryInfo adasTrajectoryInfo = new ADASTrajectoryInfo(); - adasTrajectoryInfo.setLat(trajectory.getLat()); - adasTrajectoryInfo.setLon(trajectory.getLon()); - adasTrajectoryInfo.setAcceleration(trajectory.getAcceleration()); - adasTrajectoryInfo.setAccumulatedDis(trajectory.getAccumulatedDis()); - adasTrajectoryInfo.setTime(trajectory.getTime()); - adasTrajectoryInfo.setVelocity(trajectory.getVelocity()); - adasTrajectoryInfo.setAlt(trajectory.getAlt()); - adasTrajectoryInfo.setKappa(trajectory.getKappa()); - adasTrajectoryInfo.setTheta(trajectory.getTheta()); - trajectoryInfoArrayList.add(adasTrajectoryInfo); - } -// Log.e(TAG, "time:" + System.currentTimeMillis() + "trajectoryInfoArrayList:" + trajectoryInfoArrayList); - } - CallerAutopilotPlanningListenerManager.INSTANCE.invokeAutopilotTrajectory(trajectoryInfoArrayList); - } - } - - @Override - public void onAutopilotSNRequest() { - CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutopilotSNRequest(); - } - - @ChainLog(linkCode = CHAIN_LINK_ADAS, - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_GUARDIAN, - paramIndexes = {0}, - clientPkFileName = "sn") - @Override - public void onAutopilotGuardian(AutopilotGuardianInfo guardianInfo) { - if (HdMapBuildConfig.isMapLoaded) { - AutopilotGuardianStatusInfo autopilotRoute = AdasObjectConvertUtils.INSTANCE.fromAutopilotGuardianInfo(guardianInfo); - CallerAutoPilotStatusListenerManager.INSTANCE.invokeAutopilotGuardian(autopilotRoute); - } - } - - @ChainLog(linkCode = CHAIN_LINK_ADAS, - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_RECORD, - paramIndexes = {0}, - clientPkFileName = "sn") - @Override - public void onAutopilotRecord(AutopilotRecordResult result) { - if (result != null) { - AutoPilotRecordResult real = new AutoPilotRecordResult(); - real.setDiskFree(result.getDiskFree()); - real.setId(result.getId()); - real.setDuration(result.getDuration()); - real.setNote(result.getNote()); - real.setTotal(result.getTotalSize()); - real.setType(result.getType()); - real.setFileName(result.getFilename()); - real.setKey(result.getKey()); - real.setStat(result.getStat()); - real.setTimestamp(result.getTimestamp()); - CallerAutopilotIdentifyListenerManager.INSTANCE.invokeAutopilotRecordResult(real); - } - } - - - @Override - public void onLightStateData(LightStatueInfo lightStatueInfo) { - - } - - @Override - public void onObstaclesInfo(ObstaclesInfo obstaclesInfo) { - - } - - @Override - public void onCarLaneInfo(CarLaneInfo carLaneInfo) { - - } - - @ChainLog(linkCode = CHAIN_LINK_ADAS, - linkChainLog = CHAIN_LINK_LOG_WEB_SOCKET_DATA, - endpoint = TracingConstants.Endpoint.PAD, - nodeAliasCode = CHAIN_ALIAS_CODE_ADAS_MESSAGE_AUTOPILOT_WARN, - paramIndexes = {0}, - clientPkFileName = "sn") - @Override - public void onWarnMessage(WarnMessageInfo warnMessageInfo) { - final AutopilotWarnMessage warnMessage = AdasObjectConvertUtils.INSTANCE.fromAdasObject(warnMessageInfo); - CallerAutopilotIdentifyListenerManager.INSTANCE.invokeAutopilotWarnMessage(warnMessage); - } - - @Override - public void onVideoSize(int width, int height) { - - } - - /** - * 工控机升级状态 - * - * @param info 工控机升级状态 - */ - @Override - public void onUpgradeStateInfo(IPCUpgradeStateInfo info) { - if (info != null) { - Logger.d(TAG, "onUpgradeStateInfo " + - " upgrade mode=" + info.getUpgradeMode() + - " download status=" + info.getDownloadStatus() + - " download progress current=" + info.getProgress().getCurrent() + - " download progress total=" + info.getProgress().getTotal() + - " download version=" + info.getImages() + - " upgrade status=" + info.getUpgradeStatus()); - CallerHmiManager.INSTANCE.showAdUpgradeStatus(info.getUpgradeMode(), info.getDownloadStatus(), info.getProgress().getCurrent(), - info.getProgress().getTotal(), info.getImages(), info.getUpgradeStatus()); - } else { - Logger.d(TAG, "onUpgradeStateInfo : upgrade state info is null"); - } - } - - /** - * 命令返回结果 - * @param info 结果返回实体 - */ - @Override - public void onSSHResult(SSHResult info) { - if(info!=null && "docker restart autocar_default_1".equals(info.cmd)){ - CallerHmiManager.INSTANCE.showDockerRebootResult(info.code, info.msg); - }else{ - Logger.d(TAG,"onSSHResult : result info is null"); - } - } -} diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/utils/AdasObjectConvertUtils.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/utils/AdasObjectConvertUtils.kt deleted file mode 100644 index e729b26521..0000000000 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/utils/AdasObjectConvertUtils.kt +++ /dev/null @@ -1,102 +0,0 @@ -package com.mogo.eagle.core.function.autopilot.utils - -import com.mogo.eagle.core.data.autopilot.AutopilotCarStateInfo -import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo -import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo -import com.mogo.eagle.core.data.autopilot.AutopilotWarnMessage -import com.mogo.eagle.core.data.enums.TrafficTypeEnum -import com.mogo.eagle.core.data.traffic.TrafficData -import com.zhidao.support.adas.high.bean.AutopilotRoute -import com.zhidao.support.adas.high.bean.CarStateInfo -import com.zhidao.support.adas.high.bean.RectInfo -import com.zhidao.support.adas.high.bean.WarnMessageInfo -import com.zhidao.support.adas.high.bean.guardian.AutopilotGuardianInfo -import com.zhidao.utils.common.GsonUtil - -/** - * @author xiaoyuzhou - * @date 2021/10/18 1:32 下午 - */ -object AdasObjectConvertUtils { - val TAG = "AdasObjectConvertUtils" - - fun fromAutopilotGuardianInfo(autopilotGuardianInfo: AutopilotGuardianInfo): AutopilotGuardianStatusInfo? { - return GsonUtil.objectFromJson( - GsonUtil.jsonFromObject(autopilotGuardianInfo), - AutopilotGuardianStatusInfo::class.java - ) - } - - fun fromAdasAutopilotRoute(carStateInfo: AutopilotRoute): AutopilotRouteInfo? { - return GsonUtil.objectFromJson( - GsonUtil.jsonFromObject(carStateInfo), - AutopilotRouteInfo::class.java - ) - } - - fun fromAdasCarStateInfoObject(carStateInfo: CarStateInfo): AutopilotCarStateInfo? { - return GsonUtil.objectFromJson( - GsonUtil.jsonFromObject(carStateInfo), - AutopilotCarStateInfo::class.java - ) - } - - fun fromAdasObject(info: WarnMessageInfo?): AutopilotWarnMessage? { - if (info == null) { - return null - } - val warnMessage = AutopilotWarnMessage() - warnMessage.content = info.content - warnMessage.level = info.level - try { - warnMessage.type = info.type.toInt() - } catch (e: NumberFormatException) { - return null - } - warnMessage.value = info.value - return warnMessage - } - - fun regroupTrafficDataData(datums: List?): ArrayList? { - if (datums == null || datums.isEmpty()) { - return null - } - val recognizedListResults: ArrayList = ArrayList() - for (model in datums) { - if (model == null) { - continue - } - val recognizedListResult = fromAdasTrafficDataObject(model) - if (recognizedListResult != null) { - recognizedListResults.add(recognizedListResult) - } - } - return recognizedListResults - } - - fun fromAdasTrafficDataObject(model: RectInfo.RectBean?): TrafficData? { - if (model == null) { - return null - } - val result = TrafficData() - result.uuid = model.uuid - result.lat = model.lat - result.lon = model.lon - result.type = TrafficTypeEnum.getType(model.type.toInt()) - result.heading = model.heading - result.systemTime = model.systemTime.toLong() - result.satelliteTime = model.satelliteTime.toLong() - result.alt = model.alt - result.speed = model.speed - result.carId = model.carId - result.dataAccuracy = model.dataAccuracy - result.distance = model.distance - result.threatLevel = model.drawlevel - - //Log.d(TAG, "TrafficData = $result") - return result - } - - -} - diff --git a/core/function-impl/mogo-core-function-dispatch/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$dispatch.java b/core/function-impl/mogo-core-function-dispatch/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$dispatch.java deleted file mode 100644 index 2e1119d2dc..0000000000 --- a/core/function-impl/mogo-core-function-dispatch/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Group$$dispatch.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.alibaba.android.arouter.routes; - -import com.alibaba.android.arouter.facade.enums.RouteType; -import com.alibaba.android.arouter.facade.model.RouteMeta; -import com.alibaba.android.arouter.facade.template.IRouteGroup; -import com.zhjt.dispatch.MoGoDispatchProvider; -import java.lang.Override; -import java.lang.String; -import java.util.Map; - -/** - * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */ -public class ARouter$$Group$$dispatch implements IRouteGroup { - @Override - public void loadInto(Map atlas) { - atlas.put("/dispatch/api", RouteMeta.build(RouteType.PROVIDER, MoGoDispatchProvider.class, "/dispatch/api", "dispatch", null, -1, -2147483648)); - } -} diff --git a/core/function-impl/mogo-core-function-dispatch/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctiondispatch.java b/core/function-impl/mogo-core-function-dispatch/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctiondispatch.java deleted file mode 100644 index 7b2b897abf..0000000000 --- a/core/function-impl/mogo-core-function-dispatch/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctiondispatch.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.alibaba.android.arouter.routes; - -import com.alibaba.android.arouter.facade.enums.RouteType; -import com.alibaba.android.arouter.facade.model.RouteMeta; -import com.alibaba.android.arouter.facade.template.IProviderGroup; -import com.zhjt.dispatch.MoGoDispatchProvider; -import java.lang.Override; -import java.lang.String; -import java.util.Map; - -/** - * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */ -public class ARouter$$Providers$$mogocorefunctiondispatch implements IProviderGroup { - @Override - public void loadInto(Map providers) { - providers.put("com.zhjt.dispatch.IDispatchProvider", RouteMeta.build(RouteType.PROVIDER, MoGoDispatchProvider.class, "/dispatch/api", "dispatch", null, -1, -2147483648)); - } -} diff --git a/core/function-impl/mogo-core-function-dispatch/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctiondispatch.java b/core/function-impl/mogo-core-function-dispatch/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctiondispatch.java deleted file mode 100644 index 1e699d58a1..0000000000 --- a/core/function-impl/mogo-core-function-dispatch/build/generated/source/kapt/debug/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctiondispatch.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.alibaba.android.arouter.routes; - -import com.alibaba.android.arouter.facade.template.IRouteGroup; -import com.alibaba.android.arouter.facade.template.IRouteRoot; -import java.lang.Class; -import java.lang.Override; -import java.lang.String; -import java.util.Map; - -/** - * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */ -public class ARouter$$Root$$mogocorefunctiondispatch implements IRouteRoot { - @Override - public void loadInto(Map> routes) { - routes.put("dispatch", ARouter$$Group$$dispatch.class); - } -} diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/core/function-impl/mogo-core-function-dispatch/build/intermediates/annotation_processor_list/debug/annotationProcessors.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/core/function-impl/mogo-core-function-dispatch/build/intermediates/annotation_processor_list/debug/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/compile_library_classes/debug/classes.jar b/core/function-impl/mogo-core-function-dispatch/build/intermediates/compile_library_classes/debug/classes.jar deleted file mode 100644 index 24478df057..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/compile_library_classes/debug/classes.jar and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$dispatch.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$dispatch.class deleted file mode 100644 index 782989ef57..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Group$$dispatch.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctiondispatch.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctiondispatch.class deleted file mode 100644 index b152620663..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogocorefunctiondispatch.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctiondispatch.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctiondispatch.class deleted file mode 100644 index 16e67427f7..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/alibaba/android/arouter/routes/ARouter$$Root$$mogocorefunctiondispatch.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/BuildConfig.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/BuildConfig.class deleted file mode 100644 index 0fc86da23a..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/BuildConfig.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAirportDialog.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAirportDialog.class deleted file mode 100644 index c1c01d5112..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAirportDialog.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$1.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$1.class deleted file mode 100644 index 9f6e0a1bc5..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$1.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$2.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$2.class deleted file mode 100644 index b1aab0875d..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$2.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$3.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$3.class deleted file mode 100644 index 422eeca500..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$3.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$4.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$4.class deleted file mode 100644 index 327a5047d2..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager$4.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager.class deleted file mode 100644 index ff524a3eed..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchAutoPilotManager.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchBaseDialog.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchBaseDialog.class deleted file mode 100644 index ede40ef59e..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchBaseDialog.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchCarsDialog$1.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchCarsDialog$1.class deleted file mode 100644 index 29c148b6f4..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchCarsDialog$1.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchCarsDialog.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchCarsDialog.class deleted file mode 100644 index d1b2ff0bdf..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchCarsDialog.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchDialogManager.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchDialogManager.class deleted file mode 100644 index a9db3a3a74..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchDialogManager.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchTestPanelBroadCastReceiver.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchTestPanelBroadCastReceiver.class deleted file mode 100644 index 444e6a9b1e..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/DispatchTestPanelBroadCastReceiver.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/IDispatchProvider.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/IDispatchProvider.class deleted file mode 100644 index ede480c93f..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/IDispatchProvider.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/IDispatchRemindClickListener.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/IDispatchRemindClickListener.class deleted file mode 100644 index 916340b8eb..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/IDispatchRemindClickListener.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/MoGoDispatchProvider.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/MoGoDispatchProvider.class deleted file mode 100644 index 8da176c009..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/MoGoDispatchProvider.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel$1.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel$1.class deleted file mode 100644 index da7cd2c5bb..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel$1.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel$2.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel$2.class deleted file mode 100644 index 69053ea078..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel$2.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel$3.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel$3.class deleted file mode 100644 index a98a48c10f..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel$3.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel.class deleted file mode 100644 index 2ca6e740e3..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/DispatchServiceModel.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/IDispatch.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/IDispatch.class deleted file mode 100644 index 43f4d4bfce..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/IDispatch.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/IDispatchAdasApiService.class b/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/IDispatchAdasApiService.class deleted file mode 100644 index fd82a6bd7c..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/javac/debug/classes/com/zhjt/dispatch/model/IDispatchAdasApiService.class and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/library_java_res/debug/res.jar b/core/function-impl/mogo-core-function-dispatch/build/intermediates/library_java_res/debug/res.jar deleted file mode 100644 index 15cb0ecb3e..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/library_java_res/debug/res.jar and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/intermediates/runtime_library_classes/debug/classes.jar b/core/function-impl/mogo-core-function-dispatch/build/intermediates/runtime_library_classes/debug/classes.jar deleted file mode 100644 index 24478df057..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/intermediates/runtime_library_classes/debug/classes.jar and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin b/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin deleted file mode 100644 index 1124a139b2..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/ap-classpath-entries.bin and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/apt-cache.bin b/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/apt-cache.bin deleted file mode 100644 index 87007d0e6c..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/apt-cache.bin and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/classpath-entries.bin b/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/classpath-entries.bin deleted file mode 100644 index 02a0f00778..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/classpath-entries.bin and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/classpath-structure.bin b/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/classpath-structure.bin deleted file mode 100644 index 2687ad7d42..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/classpath-structure.bin and /dev/null differ diff --git a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/java-cache.bin b/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/java-cache.bin deleted file mode 100644 index de9391c700..0000000000 Binary files a/core/function-impl/mogo-core-function-dispatch/build/tmp/kapt3/incApCache/debug/java-cache.bin and /dev/null differ diff --git a/core/mogo-core-data/src/main/proto/chassis.proto b/libraries/mogo-adas-data/src/main/proto/chassis.proto similarity index 100% rename from core/mogo-core-data/src/main/proto/chassis.proto rename to libraries/mogo-adas-data/src/main/proto/chassis.proto diff --git a/core/mogo-core-data/src/main/proto/header.proto b/libraries/mogo-adas-data/src/main/proto/header.proto similarity index 100% rename from core/mogo-core-data/src/main/proto/header.proto rename to libraries/mogo-adas-data/src/main/proto/header.proto diff --git a/core/mogo-core-data/src/main/proto/message_pad.proto b/libraries/mogo-adas-data/src/main/proto/message_pad.proto similarity index 100% rename from core/mogo-core-data/src/main/proto/message_pad.proto rename to libraries/mogo-adas-data/src/main/proto/message_pad.proto diff --git a/core/mogo-core-data/src/main/proto/mogo_report_msg.proto b/libraries/mogo-adas-data/src/main/proto/mogo_report_msg.proto similarity index 100% rename from core/mogo-core-data/src/main/proto/mogo_report_msg.proto rename to libraries/mogo-adas-data/src/main/proto/mogo_report_msg.proto diff --git a/core/mogo-core-data/src/main/proto/record_panel.proto b/libraries/mogo-adas-data/src/main/proto/record_panel.proto similarity index 100% rename from core/mogo-core-data/src/main/proto/record_panel.proto rename to libraries/mogo-adas-data/src/main/proto/record_panel.proto diff --git a/core/mogo-core-data/src/main/proto/vehicle_state.proto b/libraries/mogo-adas-data/src/main/proto/vehicle_state.proto similarity index 100% rename from core/mogo-core-data/src/main/proto/vehicle_state.proto rename to libraries/mogo-adas-data/src/main/proto/vehicle_state.proto