From 478be4a2636e9a2299c04e628e857322532a04ba Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Fri, 17 Feb 2023 19:06:48 +0800 Subject: [PATCH 01/10] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96obu=20v2i=E5=92=8Cv2v=E5=BC=80=E5=85=B3=EF=BC=8C?= =?UTF-8?q?=E5=B0=81=E8=A3=85=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacenter/obu/MoGoObuProvider.kt | 38 +- .../obu/MogoPrivateObuNewManager.kt | 660 +++++++++--------- .../mogo-core-function-hmi/build.gradle | 1 - .../hmi/ui/setting/DebugSettingView.kt | 12 +- .../function/hmi/ui/setting/SOPSettingView.kt | 9 +- .../src/main/res/layout/view_sop_setting.xml | 2 + .../eagle/core/data/config/HmiBuildConfig.kt | 4 +- .../mogo/eagle/core/data/obu/ObuStatusInfo.kt | 5 - .../core/function/api/obu/IMoGoObuProvider.kt | 2 + .../function/call/obu/CallerObuApiManager.kt | 7 + 10 files changed, 384 insertions(+), 356 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt index 29eb90cdbc..0e6f1f200d 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MoGoObuProvider.kt @@ -20,7 +20,6 @@ import com.mogo.support.obu.MogoObuManager @Route(path = MogoServicePaths.PATH_V2X_OBU_MOGO) class MoGoObuProvider : IMoGoObuProvider { private val TAG = "MoGoObuProvider" - private var mContext: Context? = null private val taxiObuIp = "192.168.1.199" //obu的taxi和bus的ip已经全部统一成1网段ip @@ -36,10 +35,11 @@ class MoGoObuProvider : IMoGoObuProvider { MogoObuDcCombineManager.INSTANCE.init(context) CallerLogger.d("$M_OBU$TAG", "初始化蘑菇自研OBU…… localIp = " + CommonUtils.getLocalIPAddress()) - //bus乘客版本obu功能去掉，大理项目需要全部车辆接收，不在限制 + //bus乘客版本obu功能去掉，大理项目需要全部车辆接收，不再限制 mContext = context mContext?.let { - val ipAddress = SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp) + val ipAddress = + SharedPrefsMgr.getInstance(context).getString(MoGoConfig.OBU_IP, taxiObuIp) //mogo obu MogoPrivateObuNewManager.INSTANCE.connectObu( it, @@ -53,32 +53,28 @@ class MoGoObuProvider : IMoGoObuProvider { * 通过控制面板设置ip，进行传递 */ override fun connect(ipAddress: String) { - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) - && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) - ) { - //不处理 - } else { - mContext?.let { - // 保存本地OBU IP地址 - SharedPrefsMgr.getInstance(it).putString(MoGoConfig.OBU_IP, ipAddress) + mContext?.let { + // 保存本地OBU IP地址 + SharedPrefsMgr.getInstance(it).putString(MoGoConfig.OBU_IP, ipAddress) - //连接 mogo obu - MogoPrivateObuNewManager.INSTANCE.connectObu( - it, - ipAddress, - CommonUtils.getIpAddressString() - ) - - } + //连接 mogo obu + MogoPrivateObuNewManager.INSTANCE.connectObu( + it, + ipAddress, + CommonUtils.getIpAddressString() + ) } } override fun disConnect() { - MogoPrivateObuNewManager.INSTANCE.disconnect() + MogoPrivateObuNewManager.INSTANCE.disConnectObu() } override fun isConnected(): Boolean { - return MogoObuManager.getInstance().connectStatus == 1 + return MogoPrivateObuNewManager.INSTANCE.isConnected() } + override fun setObuLog(isChecked: Boolean) { + MogoPrivateObuNewManager.INSTANCE.setObuLog(isChecked) + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index 71a0eab932..cf1a909d8c 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -29,9 +29,11 @@ import com.mogo.support.obu.ObuBase import com.mogo.support.obu.ObuScene import com.mogo.support.obu.constants.MogoObuComType import com.mogo.support.obu.constants.MogoObuConstants +import com.mogo.support.obu.constants.MogoObuLogLevel import com.mogo.support.obu.constants.MogoObuTopicId import com.mogo.support.obu.model.* import com.mogo.support.obu.option.MogoObuCom +import com.mogo.support.obu.option.MogoObuLog import com.mogo.support.obu.option.MogoObuOptions import com.zhidao.support.obu.ObuManager import com.zhidao.support.obu.OnObuListener @@ -74,7 +76,7 @@ class MogoPrivateObuNewManager private constructor() { .build() //每次连接的时候如果连接连接了，先断开，防止ip改变等导致的连接失败 - if (ObuManager.getInstance().connectStatus == 1) { + if (ObuManager.getInstance().connectStatus == MogoObuConstants.CONNECT_STATUS.CONNECTED) { try { ObuManager.getInstance().disconnect() } catch (e: Exception) { @@ -84,12 +86,33 @@ class MogoPrivateObuNewManager private constructor() { ObuManager.getInstance().connect(options) } - fun getMogoObuListener(): OnObuListener { - return mogoObuListener + + /** + * 断开新obu + */ + fun disConnectObu() { + try { + ObuManager.getInstance().disconnect() + } catch (e: Exception) { + e.printStackTrace() + } } - fun disconnect() { - ObuManager.getInstance().disconnect() + /** + * 新obu是否连接 + */ + fun isConnected(): Boolean { + return ObuManager.getInstance().connectStatus == MogoObuConstants.CONNECT_STATUS.CONNECTED + } + + fun setObuLog(isChecked: Boolean) { + ObuManager.getInstance().setEnableLog(isChecked) + val builder: com.mogo.support.obu.option.MogoObuLog.Builder = + MogoObuLog.newBuilder().setEnableStdio(isChecked) + if (isChecked) { + builder.setStdioLevel(MogoObuLogLevel.DBG) + } + ObuManager.getInstance().logConfig(builder.build()) } private val mogoObuListener: OnObuListener = object : OnObuListener { @@ -133,260 +156,270 @@ class MogoPrivateObuNewManager private constructor() { * v2v预警信息 CvxRvInfoIndInfo CvxV2vThreatIndInfo 他车 */ override fun onObuRvWarning(data: ObuScene.RvWarningData) { -// if (HmiBuildConfig.isShowObuV2vView) { //TODO 临时需要关闭v2v开关 - if (data.warningMsg != null && !data.warningMsg.warningDataList.isNullOrEmpty()) { - // 更新数据，远车数据，之前要匹配uuid - TrafficDataConvertUtilsNew.cvxRvInfoIndInfo2TrafficData(data.vehBasicsMsg)?.let { - CallerMapUIServiceManager.getMarkerService()?.updateITrafficLocationInfo(it) - } - - CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", data.toString()) - data.let { - //预警信息,预警类型 threat_level 2、3 - data.vehBasicsMsg?.let { - //预警方位 - val direction = getMessageDirection(data.vehBasicsMsg.targetPosition) - //处理预警类型 - var appId = "" - var level = -1 - var status = -1 - data.warningMsg?.let { - if (data.warningMsg.warningDataList != null && data.warningMsg.warningDataList.size > 0) { - level = data.warningMsg.warningDataList[0].warningLevel - appId = data.warningMsg.warningDataList[0].warningType.toString() - status = data.warningMsg.warningDataList[0].status - //拼凑数据 - handleSdkObu(appId, direction, status, level, data) - } + if (HmiBuildConfig.isShowObuV2vView) { + if (data.warningMsg != null && !data.warningMsg.warningDataList.isNullOrEmpty()) { + // 更新数据，远车数据，之前要匹配uuid + TrafficDataConvertUtilsNew.cvxRvInfoIndInfo2TrafficData(data.vehBasicsMsg) + ?.let { + CallerMapUIServiceManager.getMarkerService() + ?.updateITrafficLocationInfo(it) } - CallerLogger.d( - "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "onMogoObuRvWarning target_classification = ${ - getMessageDirection(data.vehBasicsMsg.targetPosition) - } --- direction = $direction --- appId = $appId ---level = $level -- status = $status" - ) + CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", data.toString()) + data.let { + //预警信息,预警类型 threat_level 2、3 + data.vehBasicsMsg?.let { + //预警方位 + val direction = getMessageDirection(data.vehBasicsMsg.targetPosition) + //处理预警类型 + var appId = "" + var level = -1 + var status = -1 + data.warningMsg?.let { + if (data.warningMsg.warningDataList != null && data.warningMsg.warningDataList.size > 0) { + level = data.warningMsg.warningDataList[0].warningLevel + appId = + data.warningMsg.warningDataList[0].warningType.toString() + status = data.warningMsg.warningDataList[0].status + //拼凑数据 + handleSdkObu(appId, direction, status, level, data) + } + } + + CallerLogger.d( + "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", + "onMogoObuRvWarning target_classification = ${ + getMessageDirection(data.vehBasicsMsg.targetPosition) + } --- direction = $direction --- appId = $appId ---level = $level -- status = $status" + ) + } } } } -// } } /** * 红绿灯预警信息 CvxIvpThreatIndInfo */ override fun onObuSpatWarning(data: ObuScene.SpatWarningData) { - handlerTrafficLight( - data.warningType, - data.status, - data.lightsList - ) + if (HmiBuildConfig.isShowObuV2iView) { + handlerTrafficLight( + data.warningType, + data.status, + data.lightsList + ) + } } /** * RSI预警信息 onMogoObuRsiWarning（交通标志预警（前方限速、前方学校等等），交通事件预警（前方拥堵、前方积水等等）） */ override fun onObuRsiWarning(data: ObuScene.RsiWarningData) { -// if (HmiBuildConfig.isShowObuV2iView) { - if (data.warningMsgList != null && data.warningMsgList.size > 0) { - var alertContent = "" - var ttsContent = "" - var appId = data.warningMsgList[0].sceneType.toString() - val status = data.status - val level = data.warningMsgList[0].warningLevel - val direction = getMessageDirection(data.warningMsgList[0].targetPosition) - CallerLogger.d( - "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "onMogoObuRsiWarning appId = $appId --status = $status --level = $level -- eventSerialNum = ${data.warningMsgList[0].eventSerialNum} ---signSerialNum = ${data.warningMsgList[0].signSerialNum} --- direction = $direction -- targetPosition = ${data.warningMsgList[0].targetPosition}" - ) + if (HmiBuildConfig.isShowObuV2iView) { + if (data.warningMsgList != null && data.warningMsgList.size > 0) { + var alertContent = "" + var ttsContent = "" + var appId = data.warningMsgList[0].sceneType.toString() + val status = data.status + val level = data.warningMsgList[0].warningLevel + val direction = getMessageDirection(data.warningMsgList[0].targetPosition) + CallerLogger.d( + "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", + "onMogoObuRsiWarning appId = $appId --status = $status --level = $level -- eventSerialNum = ${data.warningMsgList[0].eventSerialNum} ---signSerialNum = ${data.warningMsgList[0].signSerialNum} --- direction = $direction -- targetPosition = ${data.warningMsgList[0].targetPosition}" + ) - if (appId != "0") { - when (appId) { - // 道路危险情况预警 - MogoObuConstants.RSI_SCENE_TYPE.HLW.toString() -> { - when (data.warningMsgList[0].eventSerialNum) { - MogoObuConstants.RTE.RTI_TYPE_BREAKDOWN -> {//车辆故障 - appId = - EventTypeEnumNew.TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType - } - MogoObuConstants.RTE.RTI_TYPE_ROAD_WATER -> { //道路积水 - appId = EventTypeEnumNew.FOURS_PONDING.poiType - } - MogoObuConstants.RTE.RTI_TYPE_PARKING_VIOLATION -> { //异常停车 - appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PARKING.poiType - } + if (appId != "0") { + when (appId) { + // 道路危险情况预警 + MogoObuConstants.RSI_SCENE_TYPE.HLW.toString() -> { + when (data.warningMsgList[0].eventSerialNum) { + MogoObuConstants.RTE.RTI_TYPE_BREAKDOWN -> {//车辆故障 + appId = + EventTypeEnumNew.TYPE_USECASE_ID_BREAKDOWN_WARNING.poiType + } + MogoObuConstants.RTE.RTI_TYPE_ROAD_WATER -> { //道路积水 + appId = EventTypeEnumNew.FOURS_PONDING.poiType + } + MogoObuConstants.RTE.RTI_TYPE_PARKING_VIOLATION -> { //异常停车 + appId = + EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PARKING.poiType + } // MogoObuConstants.RTE.RTI_TYPE_CONSTRUCTION_RTE -> { //施工占道，和标牌重复 // appId = EventTypeEnumNew.FOURS_ROAD_WORK.poiType // } - MogoObuConstants.RTE.RTI_TYPE_SPEEDING -> { //超速行驶 - appId = EventTypeEnumNew.TYPE_USECASE_ID_SLW.poiType - } - MogoObuConstants.RTE.RTI_TYPE_RETRIGRADE -> { //车辆逆行 - appId = - EventTypeEnumNew.TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType + MogoObuConstants.RTE.RTI_TYPE_SPEEDING -> { //超速行驶 + appId = EventTypeEnumNew.TYPE_USECASE_ID_SLW.poiType + } + MogoObuConstants.RTE.RTI_TYPE_RETRIGRADE -> { //车辆逆行 + appId = + EventTypeEnumNew.TYPE_USECASE_ID_ROAD_VEHICLE_RETROGRADE.poiType + } } + alertContent = EventTypeEnumNew.getWarningContent(appId) + ttsContent = EventTypeEnumNew.getWarningTts(appId) + alertContent = String.format( //事件才有影响范围 + alertContent, + Math.round(data.warningMsgList[0].distance).toString(), + Math.round(data.warningMsgList[0].eventRadius).toString() + ) + ttsContent = String.format( + ttsContent, + Math.round(data.warningMsgList[0].distance).toString(), + Math.round(data.warningMsgList[0].eventRadius).toString() + ) } - alertContent = EventTypeEnumNew.getWarningContent(appId) - ttsContent = EventTypeEnumNew.getWarningTts(appId) - alertContent = String.format( //事件才有影响范围 - alertContent, - Math.round(data.warningMsgList[0].distance).toString(), - Math.round(data.warningMsgList[0].eventRadius).toString() - ) - ttsContent = String.format( - ttsContent, - Math.round(data.warningMsgList[0].distance).toString(), - Math.round(data.warningMsgList[0].eventRadius).toString() - ) - } - //车内标牌 - MogoObuConstants.RSI_SCENE_TYPE.IVS.toString() -> { - when (data.warningMsgList[0].signSerialNum) { - MogoObuConstants.RTS.RTI_TYPE_SHAPR_TURNS -> { //急转弯 - appId = EventTypeEnumNew.TYPE_ID_SHAPR_TURNS.poiType - } - MogoObuConstants.RTS.RTI_TYPE_BRIDGE -> { //桥梁 - appId = EventTypeEnumNew.TYPE_ID_BRIDGE.poiType - } - MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN -> { //行人 - appId = EventTypeEnumNew.TYPE_ID_PEDESTRIAN.poiType - } - MogoObuConstants.RTS.RTI_TYPE_SLIPPERY_ROAD -> { //路滑 - appId = EventTypeEnumNew.TYPE_ID_SLIPPERY_ROAD.poiType - } - MogoObuConstants.RTS.RTI_TYPE_TUNNEL -> { //隧道 - appId = EventTypeEnumNew.TYPE_ID_TUNNEL.poiType - } - MogoObuConstants.RTS.RTI_TYPE_FERRY -> { //渡轮 - appId = EventTypeEnumNew.TYPE_ID_FERRY.poiType - } - MogoObuConstants.RTS.RTI_TYPE_UNEVEN_ROAD -> { //路面不平 - appId = EventTypeEnumNew.TYPE_ID_UNEVEN_ROAD.poiType - } - MogoObuConstants.RTS.RTI_TYPE_NON_MOTOR_VEHICLE -> { //非机动车 - appId = EventTypeEnumNew.TYPE_ID_NON_MOTOR_VEHICLE.poiType - } - MogoObuConstants.RTS.RTI_TYPE_OBSTACLE -> { //障碍 - appId = EventTypeEnumNew.TYPE_ID_OBSTACLE.poiType - } - MogoObuConstants.RTS.RTI_TYPE_CONSTRUCTION -> { //施工 - appId = EventTypeEnumNew.TYPE_FOURS_ROAD_WORK.poiType - } - MogoObuConstants.RTS.RTI_TYPE_VEHICLE_QUEUE -> { //车队 - appId = EventTypeEnumNew.TYPE_VEHICLE_QUEUE.poiType - } - MogoObuConstants.RTS.RTI_TYPE_NO_PASSING -> { //不通 - appId = EventTypeEnumNew.TYPE_NO_PASSING.poiType - } - MogoObuConstants.RTS.RTI_TYPE_NO_TURNING_AROUND -> { //禁止掉头 - appId = EventTypeEnumNew.TYPE_NO_TURNING_AROUND.poiType - } - MogoObuConstants.RTS.RTI_TYPE_NO_STOPPING -> { //禁止停车 - appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_PARKING.poiType - } - MogoObuConstants.RTS.RTI_TYPE_NO_TOOTING -> { //禁止鸣笛 - appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType - } + //车内标牌 + MogoObuConstants.RSI_SCENE_TYPE.IVS.toString() -> { + when (data.warningMsgList[0].signSerialNum) { + MogoObuConstants.RTS.RTI_TYPE_SHAPR_TURNS -> { //急转弯 + appId = EventTypeEnumNew.TYPE_ID_SHAPR_TURNS.poiType + } + MogoObuConstants.RTS.RTI_TYPE_BRIDGE -> { //桥梁 + appId = EventTypeEnumNew.TYPE_ID_BRIDGE.poiType + } + MogoObuConstants.RTS.RTI_TYPE_PEDESTRIAN -> { //行人 + appId = EventTypeEnumNew.TYPE_ID_PEDESTRIAN.poiType + } + MogoObuConstants.RTS.RTI_TYPE_SLIPPERY_ROAD -> { //路滑 + appId = EventTypeEnumNew.TYPE_ID_SLIPPERY_ROAD.poiType + } + MogoObuConstants.RTS.RTI_TYPE_TUNNEL -> { //隧道 + appId = EventTypeEnumNew.TYPE_ID_TUNNEL.poiType + } + MogoObuConstants.RTS.RTI_TYPE_FERRY -> { //渡轮 + appId = EventTypeEnumNew.TYPE_ID_FERRY.poiType + } + MogoObuConstants.RTS.RTI_TYPE_UNEVEN_ROAD -> { //路面不平 + appId = EventTypeEnumNew.TYPE_ID_UNEVEN_ROAD.poiType + } + MogoObuConstants.RTS.RTI_TYPE_NON_MOTOR_VEHICLE -> { //非机动车 + appId = EventTypeEnumNew.TYPE_ID_NON_MOTOR_VEHICLE.poiType + } + MogoObuConstants.RTS.RTI_TYPE_OBSTACLE -> { //障碍 + appId = EventTypeEnumNew.TYPE_ID_OBSTACLE.poiType + } + MogoObuConstants.RTS.RTI_TYPE_CONSTRUCTION -> { //施工 + appId = EventTypeEnumNew.TYPE_FOURS_ROAD_WORK.poiType + } + MogoObuConstants.RTS.RTI_TYPE_VEHICLE_QUEUE -> { //车队 + appId = EventTypeEnumNew.TYPE_VEHICLE_QUEUE.poiType + } + MogoObuConstants.RTS.RTI_TYPE_NO_PASSING -> { //不通 + appId = EventTypeEnumNew.TYPE_NO_PASSING.poiType + } + MogoObuConstants.RTS.RTI_TYPE_NO_TURNING_AROUND -> { //禁止掉头 + appId = EventTypeEnumNew.TYPE_NO_TURNING_AROUND.poiType + } + MogoObuConstants.RTS.RTI_TYPE_NO_STOPPING -> { //禁止停车 + appId = + EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_PARKING.poiType + } + MogoObuConstants.RTS.RTI_TYPE_NO_TOOTING -> { //禁止鸣笛 + appId = + EventTypeEnumNew.TYPE_USECASE_ID_ROAD_NO_TOOTING.poiType + } // MogoObuConstants.RTS.RTI_TYPE_SPEED_LIMIT -> { //限速 // appId = // EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType // } - MogoObuConstants.RTS.RTI_TYPE_BUS_WARNING -> { //公交提醒 - appId = EventTypeEnumNew.TYPE_USECASE_ID_BUS_WARNING.poiType - } - MogoObuConstants.RTS.RTI_TYPE_NARROW_RIGHT -> { //右侧变窄/车道数减少 - appId = EventTypeEnumNew.TYPE_USECASE_ID_NARROW_RIGHT.poiType - } - MogoObuConstants.RTS.RTI_TYPE_GAS_STATION -> { //加油站 - appId = EventTypeEnumNew.TYPE_USECASE_ID_GAS_STATION.poiType - } - MogoObuConstants.RTS.RTI_TYPE_SCHOOL -> { //学校 - appId = - EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType - } - MogoObuConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故 - appId = EventTypeEnumNew.TYPE_USECASE_ID_ACCIDENT.poiType + MogoObuConstants.RTS.RTI_TYPE_BUS_WARNING -> { //公交提醒 + appId = EventTypeEnumNew.TYPE_USECASE_ID_BUS_WARNING.poiType + } + MogoObuConstants.RTS.RTI_TYPE_NARROW_RIGHT -> { //右侧变窄/车道数减少 + appId = + EventTypeEnumNew.TYPE_USECASE_ID_NARROW_RIGHT.poiType + } + MogoObuConstants.RTS.RTI_TYPE_GAS_STATION -> { //加油站 + appId = EventTypeEnumNew.TYPE_USECASE_ID_GAS_STATION.poiType + } + MogoObuConstants.RTS.RTI_TYPE_SCHOOL -> { //学校 + appId = + EventTypeEnumNew.TYPE_USECASE_ID_ROAD_PEDESTRIAN_SCHOOL.poiType + } + MogoObuConstants.RTS.RTI_TYPE_ACCIDENT -> { //事故 + appId = EventTypeEnumNew.TYPE_USECASE_ID_ACCIDENT.poiType + } } + + alertContent = EventTypeEnumNew.getWarningContent(appId) + ttsContent = EventTypeEnumNew.getWarningTts(appId) + alertContent = String.format( //标牌是没有影响范围的 + alertContent, + Math.round(data.warningMsgList[0].distance).toString() + ) + ttsContent = String.format( + ttsContent, + Math.round(data.warningMsgList[0].distance).toString() + ) } - alertContent = EventTypeEnumNew.getWarningContent(appId) - ttsContent = EventTypeEnumNew.getWarningTts(appId) - alertContent = String.format( //标牌是没有影响范围的 - alertContent, - Math.round(data.warningMsgList[0].distance).toString() - ) - ttsContent = String.format( - ttsContent, - Math.round(data.warningMsgList[0].distance).toString() - ) - } - - // 拥堵 - MogoObuConstants.RSI_SCENE_TYPE.TJW.toString() -> { - appId = EventTypeEnumNew.TYPE_USECASE_ID_TJW.poiType - alertContent = EventTypeEnumNew.getWarningContent(appId) - ttsContent = EventTypeEnumNew.getWarningTts(appId) - alertContent = String.format( //事件才有影响范围 - alertContent, - Math.round(data.warningMsgList[0].distance).toString(), - Math.round(data.warningMsgList[0].eventRadius).toString() - ) - ttsContent = String.format( - ttsContent, - Math.round(data.warningMsgList[0].distance).toString(), - Math.round(data.warningMsgList[0].eventRadius).toString() - ) - } - - //限速预警, ADD处理一次 - MogoObuConstants.RSI_SCENE_TYPE.SLW.toString() -> { - appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType - alertContent = EventTypeEnumNew.getWarningContent(appId) - ttsContent = EventTypeEnumNew.getWarningTts(appId) - } - } - - CallerLogger.d( - "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "new onMogoObuRsiWarning appId = $appId ---status = $status --- ttsContent = $ttsContent --alertContent = $alertContent -- eventSerialNum = ${data.warningMsgList[0].eventSerialNum} ---signSerialNum = ${data.warningMsgList[0].signSerialNum} ---direction = ${direction.direction} --distance = ${ - Math.round(data.warningMsgList[0].distance) - } ---eventRadius = ${Math.round(data.warningMsgList[0].eventRadius)} --speedMaxLimit = ${data.warningMsgList[0].speedMaxLimit.toInt()}" - ) - - when (status) { - MogoObuConstants.STATUS.ADD -> { // 添加 - //不显示弹框，语音提示,数据在消息盒子里面展示，此处不在处理弹框 - if (alertContent.isEmpty() || ttsContent.isEmpty()) { - return + // 拥堵 + MogoObuConstants.RSI_SCENE_TYPE.TJW.toString() -> { + appId = EventTypeEnumNew.TYPE_USECASE_ID_TJW.poiType + alertContent = EventTypeEnumNew.getWarningContent(appId) + ttsContent = EventTypeEnumNew.getWarningTts(appId) + alertContent = String.format( //事件才有影响范围 + alertContent, + Math.round(data.warningMsgList[0].distance).toString(), + Math.round(data.warningMsgList[0].eventRadius).toString() + ) + ttsContent = String.format( + ttsContent, + Math.round(data.warningMsgList[0].distance).toString(), + Math.round(data.warningMsgList[0].eventRadius).toString() + ) } - saveObuData(appId, alertContent, ttsContent) - showWarning(appId, alertContent, ttsContent, direction) - // 更新数据 - TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data)?.let { - CallerMapUIServiceManager.getMarkerService() - ?.updateITrafficThreatLevelInfo(it) + //限速预警, ADD处理一次 + MogoObuConstants.RSI_SCENE_TYPE.SLW.toString() -> { + appId = EventTypeEnumNew.TYPE_USECASE_ID_ROAD_SPEED_LIMIT.poiType + alertContent = EventTypeEnumNew.getWarningContent(appId) + ttsContent = EventTypeEnumNew.getWarningTts(appId) } } - MogoObuConstants.STATUS.UPDATE -> { // 更新 - } + CallerLogger.d( + "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", + "new onMogoObuRsiWarning appId = $appId ---status = $status --- ttsContent = $ttsContent --alertContent = $alertContent -- eventSerialNum = ${data.warningMsgList[0].eventSerialNum} ---signSerialNum = ${data.warningMsgList[0].signSerialNum} ---direction = ${direction.direction} --distance = ${ + Math.round(data.warningMsgList[0].distance) + } ---eventRadius = ${Math.round(data.warningMsgList[0].eventRadius)} --speedMaxLimit = ${data.warningMsgList[0].speedMaxLimit.toInt()}" + ) - MogoObuConstants.STATUS.DELETE -> { // 删除 - // 更新数据 - TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data) - ?.let { - // 事件结束，还原车辆颜色 - it.threatLevel = 0x01 - CallerMapUIServiceManager.getMarkerService() - ?.updateITrafficInfo(it) + when (status) { + MogoObuConstants.STATUS.ADD -> { // 添加 + //不显示弹框，语音提示,数据在消息盒子里面展示，此处不在处理弹框 + if (alertContent.isEmpty() || ttsContent.isEmpty()) { + return } + saveObuData(appId, alertContent, ttsContent) + showWarning(appId, alertContent, ttsContent, direction) + + // 更新数据 + TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data) + ?.let { + CallerMapUIServiceManager.getMarkerService() + ?.updateITrafficThreatLevelInfo(it) + } + } + + MogoObuConstants.STATUS.UPDATE -> { // 更新 + } + + MogoObuConstants.STATUS.DELETE -> { // 删除 + // 更新数据 + TrafficDataConvertUtilsNew.cvxRtiThreatIndInfo2TrafficData(data) + ?.let { + // 事件结束，还原车辆颜色 + it.threatLevel = 0x01 + CallerMapUIServiceManager.getMarkerService() + ?.updateITrafficInfo(it) + } + } } } } } -// } } /** @@ -405,133 +438,135 @@ class MogoPrivateObuNewManager private constructor() { "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", "onMogoObuRsmWarning ------> ${data.toString()}" ) -// if (HmiBuildConfig.isShowObuV2iView) { - if (HmiBuildConfig.isShowObuWeaknessTrafficView) { - // 交通参与者类型 0x0:未知 UNKNOWN | 1机动车 2:非机动车 NON_MOTOR | 3:行人 PEDESTRIAN 4:obu - if (data != null && data.participant != null) { - var v2xType = "" - if (data.participant.ptcType == 1) { //机动车 - v2xType = - EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType - } else if (data.participant.ptcType == 2) { //非机动车 - v2xType = - EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType - } else if (data.participant.ptcType == 3) { //行人 - v2xType = - EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.poiType - } else { //未知 - v2xType = EventTypeEnumNew.TYPE_ERROR.poiType - } - - val ttsContent = EventTypeEnumNew.getWarningTts(v2xType) - val alertContent = - EventTypeEnumNew.getWarningContent(v2xType) - var level = -1 - val direction = getMessageDirection(data.participant.targetPosition) - - //物体数据绘制 - CallerLogger.d( - "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "onMogoObuRsmWarning ---- data.status = ${data.status} ---data.participant.ptcId = ${data.participant.ptcId} ---data.participant.ptcType = ${data.participant.ptcType} ---data.warningMsg = ${data.warningMsg} -----data = ${data.toString()}" - ) - when (data.status) { - MogoObuConstants.STATUS.ADD -> { // 添加 - // 更新数据，模型变色的时候是不是update,如果不是更新，可能导致模型不变色，（add的时候，是否有level高的） TODO - TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data) - ?.let { - CallerMapUIServiceManager.getMarkerService() - ?.updateITrafficThreatLevelInfo(it) - } + if (HmiBuildConfig.isShowObuV2iView) { + if (HmiBuildConfig.isShowObuWeaknessTrafficView) { + // 交通参与者类型 0x0:未知 UNKNOWN | 1机动车 2:非机动车 NON_MOTOR | 3:行人 PEDESTRIAN 4:obu + if (data != null && data.participant != null) { + var v2xType = "" + if (data.participant.ptcType == 1) { //机动车 + v2xType = + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_MOTOR_VEHICLES.poiType + } else if (data.participant.ptcType == 2) { //非机动车 + v2xType = + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_NOT_MOTOR_VEHICLES.poiType + } else if (data.participant.ptcType == 3) { //行人 + v2xType = + EventTypeEnumNew.TYPE_USECASE_ID_VRUCW_PERSON.poiType + } else { //未知 + v2xType = EventTypeEnumNew.TYPE_ERROR.poiType } - MogoObuConstants.STATUS.UPDATE -> { // 更新 - } + val ttsContent = EventTypeEnumNew.getWarningTts(v2xType) + val alertContent = + EventTypeEnumNew.getWarningContent(v2xType) + var level = -1 + val direction = getMessageDirection(data.participant.targetPosition) - MogoObuConstants.STATUS.DELETE -> { // 删除 - // 更新数据 TODO 删除原来的，改变颜色，删除marker。不影响别的模型添加 - TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data) - ?.let { - // 事件结束，还原交通参与者颜色 - it.threatLevel = 0x01 - CallerMapUIServiceManager.getMarkerService() - ?.updateITrafficThreatLevelInfo(it) - } - - //删除弱势交通元素 - CallerMapUIServiceManager.getMarkerService() - ?.removeCvxRvInfoIndInfo(data.participant.ptcId.toString()) - } - } - - //预警status - if (data.warningMsg != null && data.warningMsg.warningDataList != null && data.warningMsg.warningDataList.size > 0) { - level = data.warningMsg.warningDataList[0].warningLevel //默认是1个 + //物体数据绘制 CallerLogger.d( "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "onMogoObuRsmWarning ---status---> ${data.status} ---data.warningMsg.warningData[0].status = ${data.warningMsg.warningDataList[0].status} ---v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent ---level = $level" + "onMogoObuRsmWarning ---- data.status = ${data.status} ---data.participant.ptcId = ${data.participant.ptcId} ---data.participant.ptcType = ${data.participant.ptcType} ---data.warningMsg = ${data.warningMsg} -----data = ${data.toString()}" ) - when (data.warningMsg.warningDataList[0].status) { + when (data.status) { MogoObuConstants.STATUS.ADD -> { // 添加 - //更新模型的颜色 + // 更新数据，模型变色的时候是不是update,如果不是更新，可能导致模型不变色，（add的时候，是否有level高的） TODO TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data) ?.let { CallerMapUIServiceManager.getMarkerService() ?.updateITrafficThreatLevelInfo(it) } - - if (alertContent.isEmpty() || ttsContent.isEmpty()) { - return - } - saveObuData(v2xType, alertContent, ttsContent) - showWarning(v2xType, alertContent, ttsContent, direction) } - MogoObuConstants.STATUS.UPDATE -> {// 更新 + MogoObuConstants.STATUS.UPDATE -> { // 更新 } MogoObuConstants.STATUS.DELETE -> { // 删除 - // 关闭警告红边 - CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL) + // 更新数据 TODO 删除原来的，改变颜色，删除marker。不影响别的模型添加 + TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data) + ?.let { + // 事件结束，还原交通参与者颜色 + it.threatLevel = 0x01 + CallerMapUIServiceManager.getMarkerService() + ?.updateITrafficThreatLevelInfo(it) + } + //删除弱势交通元素 CallerMapUIServiceManager.getMarkerService() ?.removeCvxRvInfoIndInfo(data.participant.ptcId.toString()) } } + + //预警status + if (data.warningMsg != null && data.warningMsg.warningDataList != null && data.warningMsg.warningDataList.size > 0) { + level = data.warningMsg.warningDataList[0].warningLevel //默认是1个 + CallerLogger.d( + "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", + "onMogoObuRsmWarning ---status---> ${data.status} ---data.warningMsg.warningData[0].status = ${data.warningMsg.warningDataList[0].status} ---v2xType = $v2xType ---alertContent = $alertContent ---ttsContent = $ttsContent ---level = $level" + ) + when (data.warningMsg.warningDataList[0].status) { + MogoObuConstants.STATUS.ADD -> { // 添加 + //更新模型的颜色 + TrafficDataConvertUtilsNew.cvxPtcThreatIndInfo2TrafficData(data) + ?.let { + CallerMapUIServiceManager.getMarkerService() + ?.updateITrafficThreatLevelInfo(it) + } + + if (alertContent.isEmpty() || ttsContent.isEmpty()) { + return + } + saveObuData(v2xType, alertContent, ttsContent) + showWarning(v2xType, alertContent, ttsContent, direction) + } + + MogoObuConstants.STATUS.UPDATE -> {// 更新 + } + + MogoObuConstants.STATUS.DELETE -> { // 删除 + // 关闭警告红边 + CallerHmiManager.dismissWarning(WarningDirectionEnum.ALERT_WARNING_ALL) + //删除弱势交通元素 + CallerMapUIServiceManager.getMarkerService() + ?.removeCvxRvInfoIndInfo(data.participant.ptcId.toString()) + } + } + } } } } -// } } /** * 地图匹配 是OBU算法输出地图匹配结果，主车匹配道路哪条路或者哪条车道 */ override fun onObuMapMath(data: ObuScene.MapMatchData?) { - if (data != null) { - CallerLogger.d( - "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "onMogoObuMapMath = ${data.status} --speedMaxLimit = ${(data.speedMaxLimit * 3.6).roundToInt()}" - ) - when (data.status) { - MogoObuConstants.STATUS.ADD -> { // 添加 - UiThreadHandler.post { - if (data.speedMaxLimit > 0) { - CallerLimitingVelocityListenerManager.invokeUnion( - (data.speedMaxLimit * 3.6).roundToInt(), DataSourceType.OBU - ) + if (HmiBuildConfig.isShowObuV2iView) { + if (data != null) { + CallerLogger.d( + "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", + "onMogoObuMapMath = ${data.status} --speedMaxLimit = ${(data.speedMaxLimit * 3.6).roundToInt()}" + ) + when (data.status) { + MogoObuConstants.STATUS.ADD -> { // 添加 + UiThreadHandler.post { + if (data.speedMaxLimit > 0) { + CallerLimitingVelocityListenerManager.invokeUnion( + (data.speedMaxLimit * 3.6).roundToInt(), DataSourceType.OBU + ) + } } } - } - MogoObuConstants.STATUS.UPDATE -> { // 更新 - } + MogoObuConstants.STATUS.UPDATE -> { // 更新 + } - MogoObuConstants.STATUS.DELETE -> { // 删除 - UiThreadHandler.post { - CallerLimitingVelocityListenerManager.invokeUnion( - -1, - DataSourceType.OBU - ) + MogoObuConstants.STATUS.DELETE -> { // 删除 + UiThreadHandler.post { + CallerLimitingVelocityListenerManager.invokeUnion( + -1, + DataSourceType.OBU + ) + } } } } @@ -543,7 +578,6 @@ class MogoPrivateObuNewManager private constructor() { * 获取消息的方位 车辆相关 */ private fun getMessageDirection(targetClassification: Int): WarningDirectionEnum { - // CallerLogger.d("$M_OBU${TAG_MOGO_NEW_OBU}", "预警红边：预警方向->$targetClassification") return when (targetClassification) { MogoObuConstants.VEH_TARGET_POSITION.AHEAD_IN_LANE, MogoObuConstants.VEH_TARGET_POSITION.ONCOMING_IN_LANE -> WarningDirectionEnum.ALERT_WARNING_TOP //正前方 @@ -589,7 +623,9 @@ class MogoPrivateObuNewManager private constructor() { if (FunctionBuildConfig.isObuWarningFusionUnion) { alertContent = "前车距离过近" ttsContent = "前车距离过近" - CallerObuWarningListenerManager.invokeTrackerFusionData(ObuManager.getInstance().obuRvToTrackedObject(info)) + CallerObuWarningListenerManager.invokeTrackerFusionData( + ObuManager.getInstance().obuRvToTrackedObject(info) + ) } else { alertContent = EventTypeEnumNew.getWarningContent(EventTypeEnumNew.TYPE_USECASE_ID_FCW.poiType) @@ -650,7 +686,7 @@ class MogoPrivateObuNewManager private constructor() { ttsContent = EventTypeEnumNew.getWarningTts(EventTypeEnumNew.TYPE_USECASE_ID_LCW.poiType) v2xType = EventTypeEnumNew.TYPE_USECASE_ID_LCW.poiType - if ( + if ( direction == WarningDirectionEnum.ALERT_WARNING_LEFT || direction == WarningDirectionEnum.ALERT_WARNING_TOP_LEFT || direction == WarningDirectionEnum.ALERT_WARNING_BOTTOM_LEFT diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle index 852be9bd7f..5229ec0dd4 100644 --- a/core/function-impl/mogo-core-function-hmi/build.gradle +++ b/core/function-impl/mogo-core-function-hmi/build.gradle @@ -68,7 +68,6 @@ dependencies { // debugImplementation rootProject.ext.dependencies.debugleakcanary // releaseImplementation rootProject.ext.dependencies.releaseleakcanary - implementation project(':libraries:mogo-obu') implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt index 0e422750f7..0c0f7961b4 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt @@ -73,9 +73,6 @@ import com.mogo.eagle.core.utilcode.mogo.toast.TipToast import com.mogo.eagle.core.utilcode.util.* import com.mogo.map.uicontroller.VisualAngleMode import com.mogo.map.uicontroller.VisualAngleMode.* -import com.mogo.support.obu.MogoObuManager -import com.mogo.support.obu.constants.MogoObuLogLevel -import com.mogo.support.obu.option.MogoObuLog import kotlinx.android.synthetic.main.view_debug_setting.view.* import kotlinx.coroutines.launch import mogo.telematics.pad.MessagePad @@ -1194,14 +1191,7 @@ internal class DebugSettingView @JvmOverloads constructor( * 设置是否输出OBU日志 true-打印日志，false-不打印日志 */ tbObuLog.setOnCheckedChangeListener { _, isChecked -> - MogoObuManager.getInstance().setEnableLog(isChecked) - - val builder: com.mogo.support.obu.option.MogoObuLog.Builder = - MogoObuLog.newBuilder().setEnableStdio(isChecked) - if (isChecked) { - builder.setStdioLevel(MogoObuLogLevel.DBG) - } - MogoObuManager.getInstance().logConfig(builder.build()) + CallerObuApiManager.setObuLog(isChecked) } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt index 6327b04bed..2b6dadfb77 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt @@ -95,18 +95,19 @@ internal class SOPSettingView @JvmOverloads constructor( } /** - * obu V2V开关 + * obu V2V开关，默认打开 */ + tbObuV2vView.isChecked = HmiBuildConfig.isShowObuV2vView tbObuV2vView.setOnCheckedChangeListener { _, isChecked -> // 默认关闭 HmiBuildConfig.isShowObuV2vView = isChecked } /** - * obu V2i开关 + * obu V2i开关，默认打开 */ + tbObuV2iView.isChecked = HmiBuildConfig.isShowObuV2iView tbObuV2iView.setOnCheckedChangeListener { _, isChecked -> - // 默认关闭 HmiBuildConfig.isShowObuV2iView = isChecked } @@ -174,7 +175,7 @@ internal class SOPSettingView @JvmOverloads constructor( //OBU控制总开关 tbObu.isChecked = CallerObuApiManager.isConnected() tbObu.setOnCheckedChangeListener { _, isChecked -> - if (!isChecked) { + if (isChecked) { CallerObuApiManager.resetObuIpAddress("192.168.1.199") } else { //断开链接 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml index e9830e19b0..8c7522b317 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_sop_setting.xml @@ -203,11 +203,13 @@ app:layout_constraintTop_toBottomOf="@id/tbCloudWeaknessTrafficSop" /> + Date: Fri, 17 Feb 2023 19:14:14 +0800 Subject: [PATCH 02/10] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../obu/MogoPrivateObuNewManager.kt | 50 ++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt index cf1a909d8c..7ab13fcfb4 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/obu/MogoPrivateObuNewManager.kt @@ -86,7 +86,6 @@ class MogoPrivateObuNewManager private constructor() { ObuManager.getInstance().connect(options) } - /** * 断开新obu */ @@ -157,7 +156,7 @@ class MogoPrivateObuNewManager private constructor() { */ override fun onObuRvWarning(data: ObuScene.RvWarningData) { if (HmiBuildConfig.isShowObuV2vView) { - if (data.warningMsg != null && !data.warningMsg.warningDataList.isNullOrEmpty()) { + if (data.warningMsg != null) { // 更新数据，远车数据，之前要匹配uuid TrafficDataConvertUtilsNew.cvxRvInfoIndInfo2TrafficData(data.vehBasicsMsg) ?.let { @@ -166,33 +165,28 @@ class MogoPrivateObuNewManager private constructor() { } CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", data.toString()) - data.let { - //预警信息,预警类型 threat_level 2、3 - data.vehBasicsMsg?.let { - //预警方位 - val direction = getMessageDirection(data.vehBasicsMsg.targetPosition) - //处理预警类型 - var appId = "" - var level = -1 - var status = -1 - data.warningMsg?.let { - if (data.warningMsg.warningDataList != null && data.warningMsg.warningDataList.size > 0) { - level = data.warningMsg.warningDataList[0].warningLevel - appId = - data.warningMsg.warningDataList[0].warningType.toString() - status = data.warningMsg.warningDataList[0].status - //拼凑数据 - handleSdkObu(appId, direction, status, level, data) - } - } - - CallerLogger.d( - "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", - "onMogoObuRvWarning target_classification = ${ - getMessageDirection(data.vehBasicsMsg.targetPosition) - } --- direction = $direction --- appId = $appId ---level = $level -- status = $status" - ) + //预警信息,预警类型 threat_level 2、3 + data.vehBasicsMsg?.let { + //预警方位 + val direction = getMessageDirection(data.vehBasicsMsg.targetPosition) + //处理预警类型 + var appId = "" + var level = -1 + var status = -1 + if (data.warningMsg.warningDataList != null && data.warningMsg.warningDataList.size > 0) { + level = data.warningMsg.warningDataList[0].warningLevel + appId = data.warningMsg.warningDataList[0].warningType.toString() + status = data.warningMsg.warningDataList[0].status + //拼凑数据 + handleSdkObu(appId, direction, status, level, data) } + + CallerLogger.d( + "$M_OBU${MogoObuConst.TAG_MOGO_NEW_OBU}", + "onMogoObuRvWarning target_classification = ${ + getMessageDirection(data.vehBasicsMsg.targetPosition) + } --- direction = $direction --- appId = $appId ---level = $level -- status = $status" + ) } } } From fc7732e8f57d48131e21f64c5ff428dd1f91803f Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 10 Feb 2023 19:32:22 +0800 Subject: [PATCH 03/10] =?UTF-8?q?[Feat]=E6=96=B0=E5=A2=9E=E9=AB=98?= =?UTF-8?q?=E7=B2=BE=E5=9C=B0=E5=9B=BE=E7=BC=93=E5=AD=98=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/map/OfflineMapDialog.kt | 170 ++++++++++++++++++ .../hmi/ui/tools/AutoPilotAndCheckView.kt | 4 + .../hmi/ui/widget/SystemVersionView.kt | 21 +++ .../res/drawable-xhdpi/download_fail_icon.png | Bin 0 -> 8253 bytes .../drawable-xhdpi/download_success_icon.png | Bin 0 -> 9547 bytes .../res/drawable-xhdpi/icon_be_updated.png | Bin 0 -> 7172 bytes .../main/res/drawable-xhdpi/icon_hd_map.png | Bin 0 -> 3196 bytes .../res/drawable/progressbar_corner_bg.xml | 43 +++++ .../main/res/layout/dialog_offline_map.xml | 135 ++++++++++++++ .../main/res/layout/view_system_version.xml | 24 ++- .../src/main/res/values/color.xml | 4 +- .../src/main/res/values/strings.xml | 7 + .../api/hmi/warning/IMoGoWaringProvider.kt | 20 +++ .../function/call/hmi/CallerHmiManager.kt | 3 + .../call/map/CallerMapUIServiceManager.kt | 12 +- gradle.properties | 2 +- .../com/mogo/map/hdcache/IHdCacheListener.kt | 5 + .../uicontroller/IMogoMapUIController.java | 10 ++ .../java/com/mogo/map/AMapViewWrapper.java | 51 ++++++ .../com/mogo/map/MogoMapUIController.java | 17 ++ .../map/uicontroller/AMapUIController.java | 16 ++ .../java/com/mogo/map/utils/HDMapUtils.kt | 27 +++ 22 files changed, 565 insertions(+), 6 deletions(-) create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/download_fail_icon.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/download_success_icon.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_be_updated.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/icon_hd_map.png create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/drawable/progressbar_corner_bg.xml create mode 100644 core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml create mode 100644 core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt create mode 100644 libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt create mode 100644 libraries/mogo-map/src/main/java/com/mogo/map/utils/HDMapUtils.kt diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt new file mode 100644 index 0000000000..aa62c470b2 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt @@ -0,0 +1,170 @@ +package com.mogo.eagle.core.function.hmi.ui.map + +import android.annotation.SuppressLint +import android.content.Context +import android.view.View +import android.widget.ImageView +import android.widget.ProgressBar +import android.widget.TextView +import androidx.annotation.MainThread +import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.content.ContextCompat +import androidx.core.content.res.ResourcesCompat +import androidx.core.view.marginTop +import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager +import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog +import com.mogo.map.hdcache.IHdCacheListener +import me.jessyan.autosize.utils.AutoSizeUtils + +/** + * 离线地图缓存 + */ +class OfflineMapDialog(context: Context): BaseFloatDialog(context) { + + private var roundRootLayout: ConstraintLayout? = null + private var offlineTitleView: TextView? = null + private var leftView: TextView? = null + private var rightView: TextView? = null + private var okView: TextView? = null + private var vertLineView: View? = null + private var horizontalLineView: View? = null + private var cacheTipView: TextView? = null + + private var progressBar: ProgressBar? = null + private var downloadPercentView: TextView? = null + private var downloadResultImg: ImageView? = null + + private var isLoading = false + private var isConfirm = true + private var isRetry = false + + init { + setContentView(R.layout.dialog_offline_map) + setCanceledOnTouchOutside(true) + + initView() + } + + private fun initView() { + roundRootLayout = findViewById(R.id.roundRootLayout) + offlineTitleView = findViewById(R.id.tv_cache_title) + progressBar = findViewById(R.id.progressBar) + downloadPercentView = findViewById(R.id.tvDownloadProgress) + leftView = findViewById(R.id.tv_cache_confirm) + rightView = findViewById(R.id.tv_cache_cancel) + okView = findViewById(R.id.tv_cache_ok) + vertLineView = findViewById(R.id.view_vertical_line) + horizontalLineView = findViewById(R.id.view_horizontal_line) + cacheTipView = findViewById(R.id.tv_cache_tips) + downloadResultImg = findViewById(R.id.iv_download_Status) + + leftView?.setOnClickListener { + when { + isConfirm -> { + cacheHDOfflineData() + showNewContent(isLoading = true, false) + } + else -> { + dismiss() + } + } + } + + rightView?.setOnClickListener { + when { + isRetry -> { + cacheHDOfflineData() + } + else -> { + dismiss() + } + } + } + + okView?.setOnClickListener { + dismiss() + } + } + + private fun cacheHDOfflineData() { + CallerMapUIServiceManager.cacheHDDataByCity(object : IHdCacheListener { + override fun onMapHdCacheProgress(cityId: Int, progress: Double) { + updateProgress(progress.toInt()) + } + }) + } + + @SuppressLint("SetTextI18n") + private fun updateProgress(progress: Int) { + if (this@OfflineMapDialog.isShowing) { + progressBar?.let { + if (it.visibility == View.VISIBLE) { + it.progress = if (progress in 1..5) 5 else progress + } + } + downloadPercentView?.text = "$progress%" + if (progress == 100) { + showNewContent(isLoading = false, true) + CallerHmiManager.updateHDDataCacheStatus(true) + } + } + } + + private fun change2NewStyle() { + roundRootLayout?.layoutParams?.width = AutoSizeUtils.dp2px(context, 1110f) + roundRootLayout?.layoutParams?.height = AutoSizeUtils.dp2px(context, 668f) + + val titleParams = offlineTitleView?.layoutParams as ConstraintLayout.LayoutParams + titleParams.topMargin = AutoSizeUtils.dp2px(context, 51f) + + val horizontalLineParams = horizontalLineView?.layoutParams as ConstraintLayout.LayoutParams + horizontalLineParams.topMargin = AutoSizeUtils.dp2px(context, 374f) + + progressBar?.visibility = View.VISIBLE + downloadPercentView?.visibility = View.VISIBLE + okView?.visibility = View.VISIBLE + + vertLineView?.visibility = View.GONE + leftView?.visibility = View.GONE + rightView?.visibility = View.GONE + cacheTipView?.visibility = View.INVISIBLE + } + + @SuppressLint("UseCompatLoadingForDrawables") + private fun showNewContent(isLoading: Boolean, isSuccess: Boolean) { + change2NewStyle() + when { + isLoading -> { + okView?.text = context.resources.getString(R.string.cancel) + offlineTitleView?.text = context.resources.getString(R.string.offline_downloading) + downloadResultImg?.visibility = View.GONE + } + else -> { + downloadResultImg?.visibility = View.VISIBLE + when { + isSuccess -> { + okView?.visibility = View.VISIBLE + okView?.text = context.resources.getString(R.string.ok_tip) + offlineTitleView?.text = context.resources.getString(R.string.offline_download_success) + progressBar?.visibility = View.GONE + downloadPercentView?.visibility = View.GONE + downloadResultImg?.background = ContextCompat.getDrawable(context, R.drawable.download_success_icon) + } + else -> { + offlineTitleView?.text = context.resources.getString(R.string.offline_download_failure) + okView?.visibility = View.GONE + progressBar?.visibility = View.GONE + downloadPercentView?.visibility = View.GONE + leftView?.visibility = View.VISIBLE + rightView?.visibility = View.VISIBLE + vertLineView?.visibility = View.VISIBLE + rightView?.text = context.resources.getString(R.string.retry) + downloadResultImg?.background = ContextCompat.getDrawable(context, R.drawable.download_fail_icon) + } + } + } + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt index b6025d5503..b9b5274d05 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt @@ -197,6 +197,10 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( systemVersionView?.showAdUpgradeStatus(ipcUpgradeStateInfo) } + fun updateHDDataCacheStatus(isCached: Boolean) { + systemVersionView?.updateHDDataCacheStatus(isCached) + } + override fun onAttachedToWindow() { super.onAttachedToWindow() CallerAutoPilotStatusListenerManager.addListener(TAG, this) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 913da911a7..6875daab9d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -10,10 +10,15 @@ import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener +import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingCarListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager +import com.mogo.eagle.core.function.call.bindingcar.CallerBindingCarListenerManager +import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.function.hmi.ui.map.OfflineMapDialog import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI import com.mogo.eagle.core.utilcode.util.AppUtils @@ -135,6 +140,12 @@ class SystemVersionView @JvmOverloads constructor( } + ivHDCache.setOnClickListener { + OfflineMapDialog(context).show() + } + + updateHDDataCacheStatus(CallerMapUIServiceManager.isCityDataCached()) + if(AdUpgradeStateHelper.isConfirmUpgrade()){ //将角标改为“下载中” ivAdStatus?.setImageResource(R.drawable.icon_downloading) @@ -239,6 +250,16 @@ class SystemVersionView @JvmOverloads constructor( } + fun updateHDDataCacheStatus(isCached: Boolean) { + if (isCached) { + ivHDCacheStatus?.setImageResource(R.drawable.icon_latest_version) + ivHDCache.isEnabled = false + } else { + ivHDCacheStatus?.setImageResource(R.drawable.icon_be_updated) + ivHDCache.isEnabled = true + } + } + /** * 展示当前鹰眼版本 */ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/download_fail_icon.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/download_fail_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..809d7ee41430fdcc7ad9423a11b4352f3d3c7257 GIT binary patch literal 8253 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 literal 0 HcmV?d00001 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/download_success_icon.png b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable-xhdpi/download_success_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f6f1197a934c28a588dbdf678769c3f667b40c34 GIT binary patch literal 9547 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml new file mode 100644 index 0000000000..6ae72b0a13 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_offline_map.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml index ce0064ad18..3972c865ff 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_system_version.xml @@ -82,7 +82,6 @@ android:visibility="gone" /> - + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml index 574b9fc2f3..ff8c61e6bf 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml @@ -71,7 +71,5 @@ #FF282F62 #FFFFFF - - - + #E63B4577 \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml index f12f7f9bc0..9af0f3ad70 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml @@ -65,4 +65,11 @@ 车辆将开启自动驾驶，并行驶至： 确认 取消 + 离线地图缓存提醒 + 是否缓存最新版本离线地图? + 离线地图下载中 + 离线地图下载成功 + 离线地图下载失败 + 确定 + 重试 diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt new file mode 100644 index 0000000000..42b0cadcfc --- /dev/null +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt @@ -0,0 +1,20 @@ +package com.mogo.eagle.core.function.api.hmi.warning + +import android.view.View +import android.view.ViewGroup +import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo +import com.mogo.eagle.core.data.enums.WarningDirectionEnum +import com.mogo.eagle.core.data.map.Infrastructure +import com.mogo.eagle.core.data.notice.NoticeNormalData +import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData +import com.mogo.eagle.core.data.report.ReportEntity +import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy +import com.mogo.eagle.core.function.api.hmi.view.IOchBusView + +/** + * @author xiaoyuzhou + * @date 2021/8/2 7:36 下午 + */ +interface IMoGoWaringProvider : IMoGoHmiViewProxy { + fun updateHDDataCacheStatus(isCached: Boolean) +} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index 8339a0c006..b6aca6f544 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -212,4 +212,7 @@ object CallerHmiManager { hmiProviderApi?.updateStatusBarDownloadView(insert, tag, progress) } + fun updateHDDataCacheStatus(isCached: Boolean) { + waringProviderApi?.updateHDDataCacheStatus(isCached) + } } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt index cb8288ae15..0562c116ee 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt @@ -5,7 +5,9 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.function.api.map.IMogoMapService import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService import com.mogo.eagle.core.function.call.base.CallerBase -import com.mogo.map.location.IMogoGDLocationClient +import com.mogo.map.hdcache.IHdCacheListener +import com.mogo.map.listener.IMogoHosListenerRegister +import com.mogo.map.location.IMogoLocationClient import com.mogo.map.marker.IMogoMarkerManager import com.mogo.map.overlay.IMogoOverlayManager import com.mogo.map.uicontroller.IMogoMapUIController @@ -30,6 +32,14 @@ object CallerMapUIServiceManager { return serviceProvider?.markerService } + fun cacheHDDataByCity(listener: IHdCacheListener) { + serviceProvider?.mapUIController?.cacheHDDataByCity(listener) + } + + fun isCityDataCached(): Boolean { + return serviceProvider?.mapUIController?.isCityDataCached ?: true + } + fun getOverlayManager(): IMogoOverlayManager?{ return serviceProvider?.overlayManager } diff --git a/gradle.properties b/gradle.properties index dd72d41281..9578aa5a52 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.4.2 MOGO_TELEMATIC_VERSION=1.4.4.2 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.10.0.2_test_01 +MAP_SDK_VERSION=2.10.0.2 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7 diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt b/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt new file mode 100644 index 0000000000..4761e40fff --- /dev/null +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/hdcache/IHdCacheListener.kt @@ -0,0 +1,5 @@ +package com.mogo.map.hdcache + +interface IHdCacheListener { + fun onMapHdCacheProgress(cityId: Int, progress: Double) +} \ No newline at end of file diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java index 362b48f839..8235fe8a36 100644 --- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java +++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java @@ -9,6 +9,9 @@ import androidx.annotation.RawRes; import com.mogo.eagle.core.data.map.CenterLine; import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.map.hdcache.IHdCacheListener; + +import org.json.JSONObject; import com.mogo.eagle.core.data.map.MogoLocation; import java.util.List; @@ -348,4 +351,11 @@ public interface IMogoMapUIController { * @param color // color:"#RRGGBB* */ void setPointCloudColor(String color); + void cacheHDDataByCity(IHdCacheListener listener); + + /** + * 当前城市离线数据是否已缓存 + * @return + */ + boolean isCityDataCached(); } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index e264f883ad..e46408c5f2 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -23,6 +23,7 @@ import android.util.Log; import android.view.MotionEvent; import android.view.View; +import androidx.annotation.MainThread; import androidx.annotation.NonNull; import com.mogo.commons.debug.DebugConfig; @@ -40,13 +41,17 @@ import com.mogo.eagle.core.function.call.map.CallerMapStyleListenerManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.toast.TipToast; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; +import com.mogo.map.hdcache.IHdCacheListener; import com.mogo.map.listener.MogoMapListenerHandler; +import com.mogo.map.location.GDLocationClient; +import com.mogo.map.navi.MogoCarLocationChangedListenerRegister; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.MapCameraPosition; import com.mogo.map.uicontroller.MapControlResult; import com.mogo.map.uicontroller.VisualAngleMode; +import com.mogo.map.utils.HDMapUtils; import com.mogo.map.utils.MogoMapUtils; import com.mogo.map.utils.ObjectUtils; import com.mogo.map.utils.ResIdCache; @@ -64,6 +69,7 @@ import com.zhidaoauto.map.sdk.open.business.PointCloudHelper; import com.zhidaoauto.map.sdk.open.camera.CameraPosition; import com.zhidaoauto.map.sdk.open.camera.CameraUpdateFactory; import com.zhidaoauto.map.sdk.open.camera.LatLngBounds; +import com.zhidaoauto.map.sdk.open.data.CityInfo; import com.zhidaoauto.map.sdk.open.data.MapDataApi; import com.zhidaoauto.map.sdk.open.location.LocationClient; import com.zhidaoauto.map.sdk.open.location.MyLocationStyle; @@ -115,6 +121,8 @@ public class AMapViewWrapper implements IMogoMapView, private boolean mIsFirstLocated = true; private boolean mIsDelayed = false; + private IHdCacheListener hdCacheListener; + public AMapViewWrapper(MapAutoView mMapView) { CallerLogger.INSTANCE.i(M_MAP + TAG, "autoop--AMapViewWrapper: init"); this.mMapView = mMapView; @@ -1035,4 +1043,47 @@ public class AMapViewWrapper implements IMogoMapView, } + + @Override + public void cacheHDDataByCity(IHdCacheListener listener) { + if (mMapView.getMapAutoViewHelper() != null) { + String gdCityCode = GDLocationClient.getInstance(getContext()).getLastCityCode(); + Integer id = HDMapUtils.getHDCityCode(gdCityCode); + if (id != null) { + hdCacheListener = listener; + mMapView.getMapAutoViewHelper().cacheHDDataByCity(id, (cityId, progress) -> { + if (Thread.currentThread() == Looper.getMainLooper().getThread()) { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheProgress(cityId, progress * 100); + } + } else { + UiThreadHandler.post(() -> { + if (hdCacheListener != null) { + hdCacheListener.onMapHdCacheProgress(cityId, progress * 100); + } + }); + } + }); + } + } + } + + @Override + public boolean isCityDataCached() { + if (mMapView.getMapAutoViewHelper() != null) { + String gdCityCode = GDLocationClient.getInstance(getContext()).getLastCityCode(); + Integer id = HDMapUtils.getHDCityCode(gdCityCode); + if (id != null) { + List cityInfoList = mMapView.getMapAutoViewHelper().getAllCityCode(); + if (cityInfoList != null) { + for (CityInfo cityInfo : cityInfoList) { + if (id == cityInfo.getCityCode()) { + return cityInfo.isCache; + } + } + } + } + } + return true; + } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java index f525de00c5..fbbb4ab578 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java @@ -2,12 +2,14 @@ package com.mogo.map; import android.graphics.Point; import android.graphics.Rect; +import android.location.Location; import android.view.View; import com.mogo.eagle.core.data.map.CenterLine; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; +import com.mogo.map.hdcache.IHdCacheListener; import com.mogo.map.uicontroller.AMapUIController; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.IMogoMapUIController; @@ -449,4 +451,19 @@ public class MogoMapUIController implements IMogoMapUIController { mDelegate.setPointCloudColor(color); } } + + @Override + public void cacheHDDataByCity(IHdCacheListener listener) { + if (mDelegate != null) { + mDelegate.cacheHDDataByCity(listener); + } + } + + @Override + public boolean isCityDataCached() { + if (mDelegate != null) { + return mDelegate.isCityDataCached(); + } + return true; + } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java index 9da7c35e7a..f48f36cc66 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java @@ -6,6 +6,7 @@ import android.view.View; import com.mogo.eagle.core.data.map.CenterLine; import com.mogo.eagle.core.data.map.MogoLatLng; +import com.mogo.map.hdcache.IHdCacheListener; import com.mogo.eagle.core.data.map.MogoLocation; import com.zhidaoauto.map.sdk.open.MapAutoApi; @@ -389,4 +390,19 @@ public class AMapUIController implements IMogoMapUIController { mClient.setPointCloudColor(color); } } + + @Override + public void cacheHDDataByCity(IHdCacheListener listener) { + if (mClient != null) { + mClient.cacheHDDataByCity(listener); + } + } + + @Override + public boolean isCityDataCached() { + if (mClient != null) { + return mClient.isCityDataCached(); + } + return true; + } } diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/HDMapUtils.kt b/libraries/mogo-map/src/main/java/com/mogo/map/utils/HDMapUtils.kt new file mode 100644 index 0000000000..b15a5c2704 --- /dev/null +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/HDMapUtils.kt @@ -0,0 +1,27 @@ +package com.mogo.map.utils + +object HDMapUtils { + private val cityCodeMap by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + val map = HashMap() + map["0831"] = 5115// 宜宾市 + map["0512"] = 3205// 苏州市 + map["0872"] = 5329// 大理市 + map["0711"] = 4207// 鄂州市 + map["028"] = 5101// 成都市 + map["0931"] = 6201// 兰州市 + map["0535"] = 3706// 烟台市 + map["027"] = 4201// 武汉市 + map["010"] = 1101// 北京市 + map["0734"] = 4304// 衡阳市 + map + } + + /** + * gdCityCode: 高德CityCode + * return: 高精地图CityCode + */ + @JvmStatic + fun getHDCityCode(gdCityCode: String?): Int? { + return cityCodeMap[gdCityCode] + } +} \ No newline at end of file From d37737d95631131158738eeeb9df60c1562ab691 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Mon, 13 Feb 2023 18:32:46 +0800 Subject: [PATCH 04/10] =?UTF-8?q?[2.14.0][Opt]=E5=9C=B0=E5=9B=BE=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E5=8A=9F=E8=83=BD=E4=BA=A4=E4=BA=92=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/widget/SystemVersionView.kt | 11 ++++++++--- .../src/main/res/values/strings.xml | 1 + .../src/main/java/com/mogo/map/utils/HDMapUtils.kt | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 6875daab9d..65f2050257 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -55,6 +55,8 @@ class SystemVersionView @JvmOverloads constructor( private var previousProgress: Int = -1 //前一秒的下载进度，用于计算下载剩余时间 private var currentProgress: Int = -1 //当前已下载包体大小 + private var isHDCached = false + init { LayoutInflater.from(context).inflate(R.layout.view_system_version, this, true) initView() @@ -141,7 +143,11 @@ class SystemVersionView @JvmOverloads constructor( } ivHDCache.setOnClickListener { - OfflineMapDialog(context).show() + if (isHDCached) {// 已缓存 + ToastUtils.showShort(resources.getString(R.string.offline_had_downloaded)) + } else {// 未缓存 + OfflineMapDialog(context).show() + } } updateHDDataCacheStatus(CallerMapUIServiceManager.isCityDataCached()) @@ -253,11 +259,10 @@ class SystemVersionView @JvmOverloads constructor( fun updateHDDataCacheStatus(isCached: Boolean) { if (isCached) { ivHDCacheStatus?.setImageResource(R.drawable.icon_latest_version) - ivHDCache.isEnabled = false } else { ivHDCacheStatus?.setImageResource(R.drawable.icon_be_updated) - ivHDCache.isEnabled = true } + isHDCached = isCached } /** diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml index 9af0f3ad70..a792f63bf1 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/strings.xml @@ -70,6 +70,7 @@ 离线地图下载中 离线地图下载成功 离线地图下载失败 + 当前已为最新版本 确定 重试 diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/HDMapUtils.kt b/libraries/mogo-map/src/main/java/com/mogo/map/utils/HDMapUtils.kt index b15a5c2704..72e8eadaa5 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/HDMapUtils.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/HDMapUtils.kt @@ -3,6 +3,7 @@ package com.mogo.map.utils object HDMapUtils { private val cityCodeMap by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { val map = HashMap() + // TODO:("高精地图自己去做") map["0831"] = 5115// 宜宾市 map["0512"] = 3205// 苏州市 map["0872"] = 5329// 大理市 From 6cd9b5d76c1a9cd89c0b436470d28ff8ac7aeed7 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 15 Feb 2023 17:14:36 +0800 Subject: [PATCH 05/10] =?UTF-8?q?[2.14.0][Opt]=E5=AF=B9=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E7=9B=92=E5=AD=90=E4=B8=ADV2X=E5=92=8C=E8=BF=90=E8=90=A5?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E5=8F=82=E6=95=B0=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/data/msgbox/OperationMsg.kt | 10 +++++++++- .../java/com/mogo/eagle/core/data/msgbox/V2XMsg.kt | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/OperationMsg.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/OperationMsg.kt index 230e98dca5..75e7be26bd 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/OperationMsg.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/OperationMsg.kt @@ -1,8 +1,16 @@ package com.mogo.eagle.core.data.msgbox +import android.util.Log +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import java.io.Serializable /** * 运营消息:-1表示初始值 */ -data class OperationMsg(val timestamp : Long, val content: String, val type: Int = -1): Serializable +data class OperationMsg(val timestamp : Long, val content: String, val type: Int = -1): Serializable { + init { + if (content.isEmpty()) { + CallerLogger.e("MsgBox", Log.getStackTraceString(Throwable())) + } + } +} diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/V2XMsg.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/V2XMsg.kt index 374c545563..b4f98777f5 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/V2XMsg.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/msgbox/V2XMsg.kt @@ -1,5 +1,7 @@ package com.mogo.eagle.core.data.msgbox +import android.util.Log +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import java.io.Serializable data class V2XMsg(var type: String = "", var content: String? = "", var tts: String? = ""): Serializable { @@ -9,5 +11,8 @@ data class V2XMsg(var type: String = "", var content: String? = "", var tts: Str init { timeStamp = System.currentTimeMillis() + if (content.isNullOrEmpty()) { + CallerLogger.e("MsgBox", Log.getStackTraceString(Throwable())) + } } } \ No newline at end of file From df3e018c30d7d9b3db6d18d29002379ed0023bd8 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 17 Feb 2023 20:25:19 +0800 Subject: [PATCH 06/10] [2.13.0-arch-opt]v2x code style --- .../ui/BusPassengerTrafficLightView.kt | 2 +- .../view/SweeperLimitingVelocityView.kt | 15 +- .../sweeper/view/SweeperTrafficDataView.java | 8 +- .../sweeper/view/SweeperTrafficLightView.kt | 2 +- .../passenger/model/TaxiPassengerModel.java | 4 +- .../ui/TaxiPassengerTrafficLightView.kt | 2 +- .../com/mogo/functions/test/RoadAITest.kt | 7 +- .../biz/v2x/overview/OverViewDataManager.kt | 2 +- .../v2x/overview/remote/OverViewServiceApi.kt | 1 + .../biz/v2x/overview/remote/V2XEventResult.kt | 20 -- .../redlightwarning/RedLightWarningManager.kt | 2 +- .../function/biz/v2x/vip/VipCarManager.kt | 2 +- .../aicloud/AiCloudSocketBizProvider.kt | 28 ++ .../datacenter/aicloud/V2XMessageListener.kt | 96 +++++++ .../MoGoAdasMsgConnectStatusListenerImpl.kt | 8 +- .../server/AsyncDataToAutopilotServer.kt | 2 +- .../datacenter/v2x/SpeedLimitDispatcher.kt | 2 +- .../datacenter/v2x/TrafficLightDispatcher.kt | 2 +- .../core/function/msgbox/MsgBoxProvider.kt | 2 +- .../binding/BindingCarNetWorkManager.kt | 3 + .../trace/TraceManager.kt | 2 +- .../tts/TtsManager.kt | 2 +- .../hmi/ui/msgbox/DriverMsgBoxBubbleView.kt | 2 +- .../hmi/ui/msgbox/DriverMsgBoxButtonView.kt | 2 +- .../hmi/ui/msgbox/DriverMsgBoxListView.kt | 4 +- .../function/hmi/ui/msgbox/MBoxBubbleView.kt | 2 +- .../ui/msgbox/PassengerMsgBoxBubbleView.kt | 5 +- .../ui/msgbox/PassengerMsgBoxButtonView.kt | 2 +- .../hmi/ui/msgbox/PassengerMsgBoxListView.kt | 6 +- .../function/hmi/ui/vehicle/PncActionsView.kt | 25 +- .../hmi/ui/widget/LimitingVelocityView.kt | 4 +- .../hmi/ui/widget/SingleTrafficLightView.kt | 2 +- .../function/hmi/ui/widget/SpeedPanelView.kt | 3 +- .../eagle/core/function/view/OverMapView.kt | 14 +- .../function/startup/MogoStartUpProvider.kt | 11 +- .../startup/stagetwo/AiCloudBizStartUp.kt | 28 ++ .../mogo-core-function-v2x/build.gradle | 16 -- .../function/v2x/events/V2XEventManager.kt | 142 ++-------- .../core/function/v2x/events/V2XPoiLoader.kt | 184 +++++++++++++ .../events/manager/IMoGoV2XMarkerManager.java | 2 +- .../manager/impl/MoGoV2XMarkerManager.java | 5 +- .../warning/V2XFrontWarningScenario.java | 2 +- .../scene/warning/V2XWarningMarker.java | 4 +- .../function/v2x/events/utils/EntityUtils.kt | 3 +- .../core/function/v2x/internal/V2XManager.kt | 257 ------------------ .../v2x/internal/callback/IV2XCallback.kt | 2 +- .../function/v2x/internal/config/V2XConfig.kt | 174 ------------ .../function/v2x/internal/event/V2XEvent.kt | 75 ----- .../v2x/internal/executor/Executors.kt | 35 --- .../v2x/internal/http/V2XRefreshModel.kt | 63 ++++- .../v2x/internal/http/api/V2XApiService.kt | 12 +- .../internal/http/body/V2XRefreshEntity.kt | 2 +- .../function/v2x/internal/logger/V2XLogger.kt | 24 -- .../socket/V2XMessageListener_401012.kt | 27 -- .../socket/V2XMessageListener_401018.kt | 27 -- .../socket/V2XMessageListener_402000.kt | 27 -- .../socket/V2XMessageListener_404000.kt | 27 -- .../socket/V2XMessageListener_503000.kt | 27 -- .../socket/V2XMessageListener_70001.kt | 27 -- .../function/v2x/road/V2XEventServiceApi.kt | 11 - core/mogo-core-data/build.gradle | 17 ++ .../core/data/constants/MogoServicePaths.java | 7 +- .../eagle/core/data/v2x}/V2XAdvanceWarning.kt | 2 +- .../mogo/eagle/core/data/v2x}/V2XBaseData.kt | 2 +- .../com/mogo/eagle/core/data/v2x/V2XEvent.kt | 105 +++---- .../eagle/core/data/v2x}/V2XEventResult.kt | 10 +- .../mogo/eagle/core/data/v2x}/V2XLocation.kt | 2 +- .../core/data/v2x}/V2XMarkerCardResult.kt | 2 +- .../eagle/core/data/v2x}/V2XMarkerResponse.kt | 3 +- .../eagle/core/data/v2x}/V2XOptimalRoute.kt | 3 +- .../eagle/core/data/v2x}/V2XRoadXEvent.kt | 2 +- .../eagle/core/data/v2x}/V2XWarningTarget.kt | 3 +- .../src/main/proto/road.proto | 0 .../api/{v2x => biz}/IFuncBizProvider.kt | 6 +- .../function/api/cloud/IMoGoCloudListener.kt | 23 +- .../msgbox/IMsgBoxEventListener.kt | 2 +- .../msgbox/IMsgBoxListener.kt | 2 +- .../msgbox/IMsgBoxProvider.kt | 2 +- .../union}/ILimitingVelocityListener.kt | 2 +- .../union}/IMoGoTrafficLightListener.kt | 2 +- ...llerChassisLocationGCJ02ListenerManager.kt | 4 +- .../call/biz/CallerFuncBizListenerManager.kt | 8 +- .../call/cloud/CallerCloudListenerManager.kt | 59 +--- .../function/call/map/CallerSmpManager.kt | 3 - .../CallerMsgBoxEventListenerManager.kt | 4 +- .../msgbox/CallerMsgBoxListenerManager.kt | 2 +- .../call/msgbox/CallerMsgBoxManager.kt | 2 +- .../CallerLimitingVelocityListenerManager.kt | 2 +- .../v2x/CallerTrafficLightListenerManager.kt | 2 +- 89 files changed, 651 insertions(+), 1131 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/remote/V2XEventResult.kt create mode 100644 core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt create mode 100644 core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/V2XMessageListener.kt create mode 100644 core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stagetwo/AiCloudBizStartUp.kt create mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XPoiLoader.kt delete mode 100755 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/V2XManager.kt delete mode 100755 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/config/V2XConfig.kt delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/event/V2XEvent.kt delete mode 100755 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/executor/Executors.kt delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/logger/V2XLogger.kt delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_401012.kt delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_401018.kt delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_402000.kt delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_404000.kt delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_503000.kt delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_70001.kt delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/road/V2XEventServiceApi.kt rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data => mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x}/V2XAdvanceWarning.kt (97%) rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data => mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x}/V2XBaseData.kt (64%) rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/road => mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x}/V2XEventResult.kt (87%) rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data => mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x}/V2XLocation.kt (87%) rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data => mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x}/V2XMarkerCardResult.kt (99%) rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data => mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x}/V2XMarkerResponse.kt (80%) rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data => mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x}/V2XOptimalRoute.kt (89%) rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data => mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x}/V2XRoadXEvent.kt (95%) rename core/{function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data => mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x}/V2XWarningTarget.kt (96%) rename core/{function-impl/mogo-core-function-v2x => mogo-core-data}/src/main/proto/road.proto (100%) rename core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/{v2x => biz}/IFuncBizProvider.kt (65%) rename core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/{ => datacenter}/msgbox/IMsgBoxEventListener.kt (91%) rename core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/{ => datacenter}/msgbox/IMsgBoxListener.kt (82%) rename core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/{ => datacenter}/msgbox/IMsgBoxProvider.kt (93%) rename core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/{v2x => datacenter/union}/ILimitingVelocityListener.kt (82%) rename core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/{v2x => datacenter/union}/IMoGoTrafficLightListener.kt (96%) diff --git a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt index e3d6f0d397..a0516d2b98 100644 --- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt +++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/ui/BusPassengerTrafficLightView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.widget.LinearLayout import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.TrafficLightEnum -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.bus.passenger.R diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt index afb9ba0c65..17e414c40d 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperLimitingVelocityView.kt @@ -8,9 +8,10 @@ import android.widget.LinearLayout import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.LimitingVelocityView_TAG -import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener +import com.mogo.eagle.core.function.api.datacenter.union.ILimitingVelocityListener import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager +import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.sweeper.R import kotlinx.android.synthetic.main.sweeper_limiting_speed.view.* @@ -34,11 +35,13 @@ class SweeperLimitingVelocityView( } override fun onLimitingVelocityChange(limitingVelocity: Int, sourceType: DataSourceType) { - if (limitingVelocity > 0) { - this.visibility = View.VISIBLE - tvLimitingVelocity.text = "$limitingVelocity" - } else { - this.visibility = View.GONE + ThreadUtils.runOnUiThread { + if (limitingVelocity > 0) { + this.visibility = View.VISIBLE + tvLimitingVelocity.text = "$limitingVelocity" + } else { + this.visibility = View.GONE + } } } diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java index 32db9adef0..0fb7be8343 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficDataView.java @@ -10,16 +10,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; -import com.mogo.eagle.core.data.enums.DataSourceType; import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisGearStateListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLamplightListener; import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisSteeringStateListener; -import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener; import com.mogo.eagle.core.function.call.autopilot.CallerChassisGearStateListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerChassisLamplightListenerManager; import com.mogo.eagle.core.function.call.autopilot.CallerChassisSteeringStateListenerManager; -import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager; -import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager; import com.mogo.eagle.core.function.hmi.ui.widget.TapPositionView; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ThreadUtils; @@ -89,7 +85,7 @@ public class SweeperTrafficDataView extends ConstraintLayout */ @Override public void onAutopilotLightSwitchData(@org.jetbrains.annotations.Nullable Chassis.LightSwitch lightSwitch) { - ThreadUtils.runOnUiThread { + ThreadUtils.runOnUiThread(() -> { //转向灯状态 0是正常 1是左转 2是右转 if (lightSwitch != null) { CallerLogger.INSTANCE.d(TAG, "车辆转向灯:" + lightSwitch.toString()); @@ -101,7 +97,7 @@ public class SweeperTrafficDataView extends ConstraintLayout sweeperTurnSignal.showDirection(); } } - } + }); } /** diff --git a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt index d56a099ad8..19a7a466bd 100644 --- a/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt +++ b/OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/view/SweeperTrafficLightView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.widget.LinearLayout import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.TrafficLightEnum -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.sweeper.R 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 9a7964d873..8f52315f09 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 @@ -30,8 +30,8 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxBean; 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.msgbox.IMsgBoxEventListener; -import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener; +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxEventListener; +import com.mogo.eagle.core.function.api.datacenter.union.ILimitingVelocityListener; 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; diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTrafficLightView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTrafficLightView.kt index 6a0c99c711..464e7a67a2 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTrafficLightView.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerTrafficLightView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.widget.LinearLayout import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.TrafficLightEnum -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.och.taxi.passenger.R diff --git a/app/src/androidTest/java/com/mogo/functions/test/RoadAITest.kt b/app/src/androidTest/java/com/mogo/functions/test/RoadAITest.kt index 72b47ade32..43ec279322 100644 --- a/app/src/androidTest/java/com/mogo/functions/test/RoadAITest.kt +++ b/app/src/androidTest/java/com/mogo/functions/test/RoadAITest.kt @@ -4,12 +4,11 @@ import android.os.* import androidx.test.core.app.* import androidx.test.ext.junit.runners.* import androidx.test.filters.* +import com.mogo.eagle.core.data.v2x.V2XEvent import com.mogo.eagle.core.function.hmi.ui.* import com.mogo.eagle.core.function.main.* import com.mogo.eagle.core.function.v2x.events.* -import com.mogo.eagle.core.function.v2x.internal.data.V2XRoadXData -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent.RoadAI +import com.mogo.eagle.core.data.v2x.V2XRoadXData import com.mogo.eagle.core.utilcode.util.GsonUtils import kotlinx.coroutines.* import org.junit.* @@ -128,7 +127,7 @@ class RoadAITest { .build()) .build()) .build() - val event = RoadAI(data = child) + val event = V2XEvent.RoadAI(data = child) while (true) { delay(1000) V2XEventManager.onAck(event) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/OverViewDataManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/OverViewDataManager.kt index eef88f1602..e022c3d245 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/OverViewDataManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/OverViewDataManager.kt @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit object OverViewDataManager { - const val TAG = "OverViewDataManager" + private const val TAG = "OverViewDataManager" private val overviewDao by lazy { OverviewDb.getDb(AbsMogoApplication.getApp()).overviewDao() diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/remote/OverViewServiceApi.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/remote/OverViewServiceApi.kt index 365f5f0d29..ffdf2be1c6 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/remote/OverViewServiceApi.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/remote/OverViewServiceApi.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.function.biz.v2x.overview.remote +import com.mogo.eagle.core.data.v2x.V2XEventResult import io.reactivex.Observable import retrofit2.http.GET import retrofit2.http.Query diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/remote/V2XEventResult.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/remote/V2XEventResult.kt deleted file mode 100644 index 0650d29817..0000000000 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/overview/remote/V2XEventResult.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.eagle.function.biz.v2x.overview.remote - -import androidx.annotation.Keep - -import com.google.gson.annotations.SerializedName -import com.mogo.eagle.core.data.BaseData -import com.mogo.eagle.core.data.v2x.V2XEvent - - -@Keep -data class V2XEventResult ( - @SerializedName("result") - var result: Result? -): BaseData() - -@Keep -data class Result( - @SerializedName("eventList") - var v2XEventList: List? -) \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt index d84b81416c..72c3b3431d 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt @@ -13,7 +13,7 @@ import com.mogo.eagle.core.data.msgbox.V2XMsg import com.mogo.eagle.core.data.trafficlight.* import com.mogo.eagle.core.data.trafficlight.TrafficLightStatusHelper.getCurrentRoadTrafficLight import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.api.v2x.IMoGoVipSetListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt index 915a90d83e..39a009b500 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt @@ -19,7 +19,7 @@ import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight import com.mogo.eagle.core.data.trafficlight.isGreen import com.mogo.eagle.core.data.trafficlight.isRed import com.mogo.eagle.core.data.v2x.VipMessage -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt new file mode 100644 index 0000000000..8f94b5a59d --- /dev/null +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/AiCloudSocketBizProvider.kt @@ -0,0 +1,28 @@ +package com.mogo.eagle.core.function.datacenter.aicloud + +import android.content.Context +import com.alibaba.android.arouter.facade.annotation.Route +import com.mogo.cloud.socket.SocketManager +import com.mogo.commons.AbsMogoApplication +import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider + +@Route(path = MogoServicePaths.PATH_AI_CLOUD) +class AiCloudSocketBizProvider : IMoGoFunctionServerProvider { + override val functionName: String + get() = "AiCloudSocketBizProvider" + + override fun init(context: Context?) { + SocketManager.getInstance().init(AbsMogoApplication.getApp(), 0.0, 0.0) + SocketManager.getInstance().registerOnMessageListener(401012, V2XMessageListener401012()) + SocketManager.getInstance().registerOnMessageListener(401018, V2XMessageListener401018()) + SocketManager.getInstance().registerOnMessageListener(402000, V2XMessageListener402000()) + SocketManager.getInstance().registerOnMessageListener(404000, V2XMessageListener404000()) + //SocketManager.getInstance().registerOnMessageListener(503000, V2XMessageListener503000()) + SocketManager.getInstance().registerOnMessageListener(70001, V2XMessageListener70001()) + } + + override fun onDestroy() { + + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/V2XMessageListener.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/V2XMessageListener.kt new file mode 100644 index 0000000000..059f4ce01a --- /dev/null +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/aicloud/V2XMessageListener.kt @@ -0,0 +1,96 @@ +package com.mogo.eagle.core.function.datacenter.aicloud + +import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener +import com.mogo.eagle.core.data.v2x.* +import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager +import roadwork.Road + +internal class V2XMessageListener70001: IMogoCloudSocketOnMessageListener { + + override fun target(msgType: Int): Class = V2XRoadXData::class.java + + override fun onMsgReceived(msgType: Int, data: V2XRoadXData?) { + if (msgType != 70001) { + return + } + if (data == null) { + return + } + CallerCloudListenerManager.invokeSocketAck(V2XEvent.RoadEventX(data = data)) + } +} + +internal class V2XMessageListener401012: IMogoCloudSocketOnMessageListener { + + override fun target(msgType: Int): Class = V2XMarkerCardResult::class.java + + override fun onMsgReceived(msgType: Int, data: V2XMarkerCardResult?) { + if (msgType != 401012) { + return + } + if (data == null) { + return + } + CallerCloudListenerManager.invokeSocketAck(V2XEvent.Road(data = data)) + } +} + +internal class V2XMessageListener401018: IMogoCloudSocketOnMessageListener { + + override fun target(msgType: Int): Class = V2XWarningTarget::class.java + + override fun onMsgReceived(msgType: Int, data: V2XWarningTarget?) { + if (msgType != 401018) { + return + } + if (data == null) { + return + } + CallerCloudListenerManager.invokeSocketAck(V2XEvent.Warning(data = data)) + } +} + +internal class V2XMessageListener402000: IMogoCloudSocketOnMessageListener { + + override fun target(msgType: Int): Class = V2XOptimalRoute::class.java + + override fun onMsgReceived(msgType: Int, data: V2XOptimalRoute?) { + if (msgType != 402000) { + return + } + if (data == null) { + return + } + CallerCloudListenerManager.invokeSocketAck(V2XEvent.OptimalRoute(data = data)) + } +} + +internal class V2XMessageListener404000: IMogoCloudSocketOnMessageListener { + + override fun target(msgType: Int): Class = V2XAdvanceWarning::class.java + + override fun onMsgReceived(msgType: Int, data: V2XAdvanceWarning?) { + if (msgType != 404000) { + return + } + if (data == null) { + return + } + CallerCloudListenerManager.invokeSocketAck(V2XEvent.ForwardsWarning(data = data)) + } +} + +internal class V2XMessageListener503000: IMogoCloudSocketOnMessageListener { + + override fun target(msgType: Int): Class = Road.RW_PB::class.java + + override fun onMsgReceived(msgType: Int, data: Road.RW_PB?) { + if (msgType != 503000) { + return + } + if (data == null) { + return + } + CallerCloudListenerManager.invokeSocketAck(V2XEvent.RoadAI(data = data)) + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 6a19fe588d..f96c1a7bde 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -1,5 +1,6 @@ package com.mogo.eagle.core.function.datacenter.autopilot.adapter +import android.content.Context import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.debug.DebugConfig.* import com.mogo.eagle.core.data.config.FunctionBuildConfig @@ -27,12 +28,15 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, IMoGoAutopilotStatusListener, IMoGoCloudListener { - private val TAG = "ConnectStatus" + + companion object{ + private const val TAG = "ConnectStatus" + } private var connectStatus = false init { - CallerCloudListenerManager.registerCloudListener(TAG, this) + CallerCloudListenerManager.addListener(TAG, this) } override fun onConnectionIPCStatus(ipcConnectionStatus: Int, reason: String?) { 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 a5bfe75e4b..6a33aa8008 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 @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.datacenter.autopilot.server import com.mogo.eagle.core.data.trafficlight.TrafficLightResult -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +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 diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/SpeedLimitDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/SpeedLimitDispatcher.kt index 6742f81aa8..0346113ae1 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/SpeedLimitDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/SpeedLimitDispatcher.kt @@ -2,7 +2,7 @@ package com.mogo.eagle.core.function.datacenter.v2x import android.content.Context import com.mogo.eagle.core.data.enums.DataSourceType -import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener +import com.mogo.eagle.core.function.api.datacenter.union.ILimitingVelocityListener import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager /** diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt index da18deaa54..b4f9c1f98a 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/v2x/TrafficLightDispatcher.kt @@ -6,7 +6,7 @@ import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.TrafficLightEnum import com.mogo.eagle.core.data.trafficlight.* import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import perception.TrafficLightOuterClass diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt index d3c4d49cd4..5c1729cbfd 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/msgbox/MsgBoxProvider.kt @@ -4,7 +4,7 @@ import android.content.Context import com.alibaba.android.arouter.facade.annotation.Route import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_MSG_BOX_MODULE import com.mogo.eagle.core.data.msgbox.MsgBoxBean -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxProvider +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxProvider import com.mogo.eagle.core.function.msgbox.DataManager.saveAllMessages2Disk @Route(path = PATH_MSG_BOX_MODULE) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index dca175382b..9daa99f962 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -152,6 +152,9 @@ class BindingCarNetWorkManager private constructor() { } private fun updateCarVrIconRes(brandId: String?) { + if(!DebugConfig.isCarModelChange()){ + return + } if (brandId == null || brandId.isEmpty()) { return } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index 95ec88c2af..ccbb9080a5 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -43,7 +43,7 @@ class TraceManager : IMoGoCloudListener, IMoGoAutopilotCarConfigListener { // 初始化Trace抓取服务 val pkgName = Utils.getApp().packageName ChainTraceStarter.start(pkgName, DeviceUtils.getMacAddress(), false) - CallerCloudListenerManager.registerCloudListener(TAG, this) + CallerCloudListenerManager.addListener(TAG, this) CallerAutopilotCarConfigListenerManager.addListener(TAG, this) // Trace过程中进行日志抓取，对日志进行配置 diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt index 2cf11f8d9f..75c46d37ec 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/tts/TtsManager.kt @@ -23,7 +23,7 @@ class TtsManager : IMoGoCloudListener { fun initTts(context: Context) { val sn = SharedPrefsMgr.getInstance(context).getString("sn") if (sn.isNullOrEmpty()) { - CallerCloudListenerManager.registerCloudListener(TraceManager.TAG, this) + CallerCloudListenerManager.addListener(TraceManager.TAG, this) } AIAssist.getInstance(context) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt index db43edc926..93ae969800 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt @@ -9,7 +9,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgCategory -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxButtonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxButtonView.kt index 5fe939bf50..1bda3f2e9b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxButtonView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxButtonView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.msgbox.MsgBoxBean -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxEventListener import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.hmi.R import kotlinx.android.synthetic.main.view_driver_msg_box_button.view.* diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt index c06b07f82b..0a24a50f88 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxListView.kt @@ -9,8 +9,8 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgCategory -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxEventListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt index 61fd81fb64..30ff6c7f23 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MBoxBubbleView.kt @@ -9,7 +9,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.MsgCategory -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.hmi.R diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt index 7625fbec80..0112f09266 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxBubbleView.kt @@ -6,18 +6,15 @@ import android.util.AttributeSet import android.view.* import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.LinearLayoutManager -import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.MsgCategory -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener -import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.PassengerMsgBoxBubbleAdapter import com.mogo.eagle.core.function.msgbox.MsgBoxConfig -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_passenger_msg_box_bubble.view.* diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxButtonView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxButtonView.kt index 3080907378..606affc6f5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxButtonView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxButtonView.kt @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.msgbox.MsgBoxBean -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxEventListener import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.hmi.R import kotlinx.android.synthetic.main.view_passenger_msg_box_button.view.* diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt index 8abbc15a48..cc8418f8d2 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/PassengerMsgBoxListView.kt @@ -7,18 +7,16 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.MsgCategory -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxEventListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxEventListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.msgbox.adapter.PassengerMsgBoxListAdapter -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils import com.mogo.eagle.core.utilcode.util.ResourceUtils.getDrawable import com.mogo.eagle.core.utilcode.util.UiThreadHandler import kotlinx.android.synthetic.main.layout_passenger_msg_box_list.view.* diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt index 66a1a68404..5cf624ff40 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/PncActionsView.kt @@ -4,7 +4,6 @@ import android.content.Context import android.util.AttributeSet import android.util.TypedValue.COMPLEX_UNIT_PX import android.view.LayoutInflater -import android.view.ViewGroup import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo @@ -17,7 +16,7 @@ import com.mogo.eagle.core.data.trafficlight.isRed import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotPlanningActionsListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener.Companion.STATUS_AUTOPILOT_RUNNING -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningActionsListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager @@ -25,8 +24,6 @@ import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.zhjt.service_biz.BizConfig import kotlinx.android.synthetic.main.view_pnc_actions.view.* -import me.jessyan.autosize.AutoSize -import me.jessyan.autosize.utils.AutoSizeUtils import mogo.telematics.pad.MessagePad class PncActionsView @JvmOverloads constructor( @@ -52,16 +49,25 @@ class PncActionsView @JvmOverloads constructor( init { LayoutInflater.from(context).inflate(R.layout.view_pnc_actions, this, true) val a = context.obtainStyledAttributes(attrs, R.styleable.PncActionsView, defStyleAttr, 0) - bgResources = a.getResourceId(R.styleable.PncActionsView_background_resource, R.drawable.pnc_actions_bg) - topMargin = a.getResourceId(R.styleable.PncActionsView_pnc_top_margin,resources.getDimension(R.dimen.dp_30).toInt()) - txtSize = a.getResourceId(R.styleable.PncActionsView_pnc_size,resources.getDimension(R.dimen.dp_34).toInt()) + bgResources = a.getResourceId( + R.styleable.PncActionsView_background_resource, + R.drawable.pnc_actions_bg + ) + topMargin = a.getResourceId( + R.styleable.PncActionsView_pnc_top_margin, + resources.getDimension(R.dimen.dp_30).toInt() + ) + txtSize = a.getResourceId( + R.styleable.PncActionsView_pnc_size, + resources.getDimension(R.dimen.dp_34).toInt() + ) a.recycle() } override fun onAttachedToWindow() { super.onAttachedToWindow() (tvHmiPncActions.layoutParams as MarginLayoutParams).topMargin = topMargin - tvHmiPncActions.setTextSize(COMPLEX_UNIT_PX,txtSize.toFloat()) + tvHmiPncActions.setTextSize(COMPLEX_UNIT_PX, txtSize.toFloat()) CallerAutoPilotStatusListenerManager.addListener(TAG, this) CallerPlanningActionsListenerManager.addListener(TAG, this) @@ -124,6 +130,9 @@ class PncActionsView @JvmOverloads constructor( tvHmiPncActions.text = actions } } + } else { + this.background = null + tvHmiPncActions.text = "" } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/LimitingVelocityView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/LimitingVelocityView.kt index 8746a17300..de83239e19 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/LimitingVelocityView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/LimitingVelocityView.kt @@ -2,14 +2,13 @@ package com.mogo.eagle.core.function.hmi.ui.widget import android.content.Context import android.util.AttributeSet -import android.util.Log import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.LimitingVelocityView_TAG -import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener +import com.mogo.eagle.core.function.api.datacenter.union.ILimitingVelocityListener import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager import com.mogo.eagle.core.function.hmi.R @@ -43,7 +42,6 @@ class LimitingVelocityView constructor( if (limitingVelocity > 0) { visibility = View.VISIBLE tvLimitingVelocity.text = "$limitingVelocity" - Log.d("emArrow","limit : ${ DataSourceType.getName(sourceType)}") tvLimitingSource.text = DataSourceType.getName(sourceType) } else { visibility = View.GONE diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt index fbd045ab7e..f770db1fbe 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SingleTrafficLightView.kt @@ -13,7 +13,7 @@ import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.TrafficLightEnum import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.TrafficLightView_TAG -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager import com.mogo.eagle.core.function.hmi.R diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt index bd8cdb8807..b7f531c972 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SpeedPanelView.kt @@ -8,12 +8,11 @@ import android.widget.FrameLayout import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener -import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener +import com.mogo.eagle.core.function.api.datacenter.union.ILimitingVelocityListener import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.utilcode.util.UiThreadHandler -import java.util.* class SpeedPanelView @JvmOverloads constructor( context: Context, diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt index f26b486ee8..7470a9932c 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/OverMapView.kt @@ -22,10 +22,10 @@ import com.amap.api.maps.TextureMapView import com.amap.api.maps.model.* import com.mogo.eagle.core.data.map.Infrastructure import com.mogo.eagle.core.data.map.MogoLocation -import com.mogo.eagle.core.data.v2x.V2XEvent +import com.mogo.eagle.core.data.v2x.V2XEventData 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.v2x.IFuncBizProvider +import com.mogo.eagle.core.function.api.biz.IFuncBizProvider import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager.getGlobalPath import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager @@ -300,8 +300,8 @@ class OverMapView @JvmOverloads constructor( geoHashInfMap = map } - override fun onV2XEvents(v2xEvents: List?) { - showV2XEventMarkers(v2xEvents) + override fun onV2XEvents(v2XEventData: List?) { + showV2XEventMarkers(v2XEventData) } }) // 主动查一次全局路径规划的数据 @@ -389,11 +389,11 @@ class OverMapView @JvmOverloads constructor( /** * 显示V2X事件的Marker */ - private fun showV2XEventMarkers(v2XEvents: List?) { - if (v2XEvents == null || v2XEvents.isEmpty()) return + private fun showV2XEventMarkers(v2XEventData: List?) { + if (v2XEventData == null || v2XEventData.isEmpty()) return clearV2XMarkers() val markerOptionsList = ArrayList() - for (v2xEvent in v2XEvents) { + for (v2xEvent in v2XEventData) { val center = v2xEvent.center if (center != null) { val markerOption = MarkerOptions() diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/MogoStartUpProvider.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/MogoStartUpProvider.kt index 0e66e82922..29acccff70 100644 --- a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/MogoStartUpProvider.kt +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/MogoStartUpProvider.kt @@ -8,10 +8,7 @@ import com.mogo.eagle.core.function.api.startup.IStartUpProvider import com.mogo.eagle.core.function.startup.stageone.APMStartup import com.mogo.eagle.core.function.startup.stageone.HttpDnsStartUp import com.mogo.eagle.core.function.startup.stageone.ThreadOptStartup -import com.mogo.eagle.core.function.startup.stagetwo.AutopilotStartUp -import com.mogo.eagle.core.function.startup.stagetwo.DataCenterStartUp -import com.mogo.eagle.core.function.startup.stagetwo.ObuStartUp -import com.mogo.eagle.core.function.startup.stagetwo.MapBizStartUp +import com.mogo.eagle.core.function.startup.stagetwo.* import com.rousetime.android_startup.StartupListener import com.rousetime.android_startup.StartupManager import com.rousetime.android_startup.model.CostTimesModel @@ -20,7 +17,7 @@ import com.rousetime.android_startup.model.StartupConfig import org.greenrobot.eventbus.EventBus @Route(path = MogoServicePaths.PATH_STARTUP_PROVIDER) -class MogoStartUpProvider: IStartUpProvider { +class MogoStartUpProvider : IStartUpProvider { private var context: Context? = null @@ -39,8 +36,7 @@ class MogoStartUpProvider: IStartUpProvider { } override fun initStageOne() { - var config: StartupConfig? = null - config = if (DebugConfig.isDebug()) { + val config = if (DebugConfig.isDebug()) { StartupConfig.Builder() .setLoggerLevel(LoggerLevel.DEBUG) .setOpenStatistics(true) @@ -78,6 +74,7 @@ class MogoStartUpProvider: IStartUpProvider { StartupManager.Builder() .addStartup(DataCenterStartUp()) .addStartup(AutopilotStartUp()) + .addStartup(AiCloudBizStartUp()) .addStartup(ObuStartUp()) .addStartup(MapBizStartUp()) .setConfig(config) diff --git a/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stagetwo/AiCloudBizStartUp.kt b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stagetwo/AiCloudBizStartUp.kt new file mode 100644 index 0000000000..903e705355 --- /dev/null +++ b/core/function-impl/mogo-core-function-startup/src/main/java/com/mogo/eagle/core/function/startup/stagetwo/AiCloudBizStartUp.kt @@ -0,0 +1,28 @@ +package com.mogo.eagle.core.function.startup.stagetwo + +import android.content.Context +import com.alibaba.android.arouter.launcher.ARouter +import com.mogo.eagle.core.data.constants.MogoServicePaths +import com.rousetime.android_startup.AndroidStartup + +class AiCloudBizStartUp : AndroidStartup() { + + override fun create(context: Context): Boolean { + ARouter.getInstance().build(MogoServicePaths.PATH_AI_CLOUD).navigation() + return true + } + + override fun callCreateOnMainThread(): Boolean { + return true + } + + override fun waitOnMainThread(): Boolean { + return false + } + + override fun dependenciesByName(): List { + val deps = arrayListOf() + deps.add("com.mogo.eagle.core.function.startup.stagetwo.DataCenterStartUp") + return deps + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/build.gradle b/core/function-impl/mogo-core-function-v2x/build.gradle index 0548690b35..8e6838c280 100644 --- a/core/function-impl/mogo-core-function-v2x/build.gradle +++ b/core/function-impl/mogo-core-function-v2x/build.gradle @@ -4,7 +4,6 @@ plugins { id 'kotlin-android-extensions' id 'kotlin-kapt' id 'com.alibaba.arouter' - id 'com.google.protobuf' } android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -36,19 +35,6 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } - protobuf { - protoc { - artifact = rootProject.ext.dependencies.protoc - } - generateProtoTasks { - all().each { task -> - task.builtins { - java {} - } - } - } - } - } dependencies { @@ -63,8 +49,6 @@ dependencies { implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.rxandroid kapt rootProject.ext.dependencies.aroutercompiler - implementation rootProject.ext.dependencies.protobuf_java - implementation rootProject.ext.dependencies.protobuf_java_util implementation rootProject.ext.dependencies.mogoaicloudtrafficlive diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt index 920a297268..b1123c6860 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt @@ -7,16 +7,9 @@ import android.os.Handler import android.os.Looper import android.util.Log import androidx.localbroadcastmanager.content.LocalBroadcastManager -import com.mogo.cloud.passport.IMoGoTokenCallback -import com.mogo.cloud.passport.MoGoAiCloudClient -import com.mogo.cloud.passport.MoGoAiCloudClientConfig -import com.mogo.commons.constants.HostConst -import com.mogo.commons.module.ServiceConst.CARD_TYPE_ROAD_CONDITION -import com.mogo.commons.network.ParamsUtil import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_V2N import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_CLOUD import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_LINK_LOG_CLOUD_V2N -import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.enums.EventTypeHelper @@ -28,11 +21,11 @@ import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgBoxType import com.mogo.eagle.core.data.msgbox.V2XMsg import com.mogo.eagle.core.data.traffic.TrafficData +import com.mogo.eagle.core.data.v2x.V2XAdvanceWarning import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.api.map.angle.* -import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager @@ -47,37 +40,30 @@ import com.mogo.eagle.core.function.v2x.events.consts.V2XConst.BROADCAST_SCENE_H import com.mogo.eagle.core.function.v2x.events.receiver.SceneBroadcastReceiver import com.mogo.eagle.core.function.v2x.events.scenario.impl.V2XScenarioManager import com.mogo.eagle.core.function.v2x.events.utils.toRoadMarker -import com.mogo.eagle.core.function.v2x.events.utils.toV2XRoadEventEntity -import com.mogo.eagle.core.function.v2x.internal.V2XManager import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback -import com.mogo.eagle.core.function.v2x.internal.config.V2XConfig -import com.mogo.eagle.core.function.v2x.internal.data.* -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent -import com.mogo.eagle.core.function.v2x.road.V2XEventServiceApi -import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.eagle.core.data.v2x.V2XEvent +import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult +import com.mogo.eagle.core.data.v2x.V2XWarningTarget +import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener +import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager +import com.mogo.eagle.core.function.v2x.events.V2XPoiLoader.Companion.v2xPoiLoader +import com.mogo.eagle.core.function.v2x.events.utils.toV2XRoadEventEntity import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X -import com.mogo.eagle.core.utilcode.util.ThreadUtils -import com.mogo.eagle.core.utilcode.util.UiThreadHandler import com.mogo.eagle.core.utilcode.util.Utils -import com.mogo.map.marker.MogoMarkersHandler.Companion.mogoMarkersHandler import com.zhjt.service.chain.ChainLog import com.zhjt.service.chain.TracingConstants -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.disposables.Disposable -import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.android.asCoroutineDispatcher import kotlinx.coroutines.cancel import kotlinx.coroutines.launch -import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicBoolean import mogo.telematics.pad.MessagePad -object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, IV2XCallback, - IMoGoAutopilotIdentifyListener { +object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, + IMoGoAutopilotIdentifyListener, IMoGoCloudListener { private const val TAG = "V2XEventManager" @@ -87,57 +73,34 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, private val hasInit by lazy { AtomicBoolean(false) } - - var v2xEventDisposable: Disposable? = null - fun init(context: Context) { BridgeApi.init(context) if (hasInit.compareAndSet(false, true)) { - if (!V2XManager.hasInit()) { - V2XManager.init(V2XConfig.Builder().also { - it.aiCloudConfig(MoGoAiCloudClientConfig.getInstance()) - it.context(context) - it.loggable(false) - it.distanceForTriggerRefresh(200f) //行驶超过200（包含）米，刷新道路周边信息（短链请求） - it.durationForTriggerRefresh( - 60, - TimeUnit.SECONDS - ) // 每隔1分钟，根据自车定位，刷新道路周边信息（短链请求） - it.executor(ThreadUtils.getIoPool()) //用到的线程池（IO类型） - it.staticParams(ParamsUtil.getStaticParams()) - }.build()) - V2XManager.start() - } registerListener() - V2XManager.forceRefresh() - MoGoAiCloudClient.getInstance().addTokenCallbacks(this) + v2xPoiLoader.startLoopPoi() // 注册广播接收场景弹窗使用的 SceneBroadcastReceiver.register(context) } } private fun registerListener() { - V2XManager.addCallback(this) - CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this) + CallerChassisLocationGCJ02ListenerManager.addListener(TAG, 1,this) + v2xPoiLoader.addCallback(this) + CallerCloudListenerManager.addListener(TAG,this) CallerAutopilotIdentifyListenerManager.addListener(TAG, this) } private fun unRegisterListener() { - V2XManager.removeCallback(this) CallerChassisLocationGCJ02ListenerManager.removeListener(TAG) + v2xPoiLoader.removeCallback(this) + CallerCloudListenerManager.removeListener(TAG) CallerAutopilotIdentifyListenerManager.removeListener(TAG) - mogoMarkersHandler.unregisterMarkerClickListener(CARD_TYPE_ROAD_CONDITION) } override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) { BridgeApi.location.set(mogoLocation) mogoLocation?.let { - if (V2XManager.hasInit()) { - V2XManager.onLocationChanged( - longitude = it.longitude, - latitude = mogoLocation.latitude - ) - } + v2xPoiLoader.updateCheck(mogoLocation.longitude,mogoLocation.latitude) refreshCarState(mogoLocation) } } @@ -167,12 +130,6 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, } } - override fun onTokenGot(token: String?, sn: String?) { - if (V2XManager.hasInit()) { - V2XManager.updateSnAndToken(sn, token) - } - } - /** * V2XEvent事件回调 */ @@ -202,12 +159,11 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, handleWarningTargetEvent(event.data) } is V2XEvent.RoadAI -> { - if(FunctionBuildConfig.isV2NFromCar){ + if (FunctionBuildConfig.isV2NFromCar) { return } handleRoadMarkerEvent(event.data.toRoadMarker()) } - is V2XEvent.RoadEventX -> { handleRoadMarkerEvent(event.data.toRoadMarker()) } @@ -220,7 +176,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, @SuppressLint("NewApi") override fun onAutopilotIdentifyPlanningObj(planningObjects: List?) { super.onAutopilotIdentifyPlanningObj(planningObjects) - if(!FunctionBuildConfig.isV2NFromCar){ + if (!FunctionBuildConfig.isV2NFromCar) { return } planningObjects?.let { @@ -277,6 +233,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, } } + //todo 可优化，与obu解析类似 private fun handleAdvanceWarningEvent(event: V2XEvent.ForwardsWarning) { scope.launch { val message = event.data @@ -422,69 +379,13 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, } fun queryWholeRoadEvents() { - if (v2xEventDisposable != null && !v2xEventDisposable!!.isDisposed) { - v2xEventDisposable!!.dispose() - } - val sn = MoGoAiCloudClientConfig.getInstance().sn - val lineId = getLineId() - if (lineId > 0) { - realQueryV2xEvents(lineId.toString(), sn) - } else { - UiThreadHandler.postDelayed({ - realQueryV2xEvents(getLineId().toString(), sn) - }, 500) - } - } - - private fun realQueryV2xEvents(lineId: String, sn: String) { - v2xEventDisposable = MoGoRetrofitFactory.getInstance(HostConst.getHost()) - .create(V2XEventServiceApi::class.java) - .queryAllV2XEventsByLineId(lineId, sn) - .map { - if (it.code == 200 || it.code == 0) { - CallerLogger.d(M_V2X + TAG, "请求成功，size为：${it.result?.v2XEventList?.size}") - return@map it.result?.v2XEventList - } else { - CallerLogger.d(M_V2X + TAG, "请求失败，code为：${it.code}") - return@map ArrayList() - } - } - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe { - val size = it?.size ?: 0 - if (size > 0) { - val msgBoxBean = - MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${size}个事件", "")) - msgBoxBean.sourceType = DataSourceType.SUMMARY - CallerMsgBoxManager.saveMsgBox(msgBoxBean) - } - } - } - - private fun getLineId(): Long { - var lineId: Long = -1 - val parameter = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo() - .autopilotControlParameters - if (parameter != null) { - if (parameter.autoPilotLine != null) { - lineId = parameter.autoPilotLine!!.lineId - CallerLogger.d(M_V2X + TAG, "lineId为:$lineId") - } else { - CallerLogger.d(M_V2X + TAG, "parameter.autoPilotLine为null") - } - } else { - CallerLogger.d(M_V2X + TAG, "parameter为null") - } - return lineId + v2xPoiLoader.queryWholeRoadEvents() } override fun onFail(msg: String) { CallerLogger.e("$M_V2X$TAG", "Error: $msg") } - override fun onError(code: Int, msg: String?) {} - fun onDestroy() { if (hasInit.compareAndSet(true, false)) { try { @@ -494,6 +395,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IMoGoTokenCallback, } finally { unRegisterListener() } + v2xPoiLoader.stopLoopPoi() } } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XPoiLoader.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XPoiLoader.kt new file mode 100644 index 0000000000..065dd53827 --- /dev/null +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XPoiLoader.kt @@ -0,0 +1,184 @@ +package com.mogo.eagle.core.function.v2x.events + +import android.os.Handler +import android.os.Looper +import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.eagle.core.data.enums.DataSourceType +import com.mogo.eagle.core.data.msgbox.MsgBoxBean +import com.mogo.eagle.core.data.msgbox.MsgBoxType +import com.mogo.eagle.core.data.msgbox.V2XMsg +import com.mogo.eagle.core.data.v2x.V2XEvent +import com.mogo.eagle.core.data.v2x.V2XMarkerResponse +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager +import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback +import com.mogo.eagle.core.function.v2x.internal.http.V2XRefreshModel +import com.mogo.eagle.core.function.v2x.internal.http.callback.IV2XRefreshCallback +import com.mogo.eagle.core.function.v2x.internal.utils.DistanceUtils +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import java.util.concurrent.CopyOnWriteArrayList +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicReference + +class V2XPoiLoader private constructor() { + + companion object { + + private const val TAG = "V2XPoiLoader" + + val v2xPoiLoader by lazy(LazyThreadSafetyMode.SYNCHRONIZED) { + V2XPoiLoader() + } + } + + private val lastLongitude by lazy { AtomicReference(0.0) } + + private val lastLatitude by lazy { AtomicReference(0.0) } + + private val realLongitude by lazy { AtomicReference(0.0) } + + private val realLatitude by lazy { AtomicReference(0.0) } + + private val handler by lazy { + Handler(Looper.getMainLooper()) + } + + private val cbs by lazy { + CopyOnWriteArrayList() + } + + /** + * 添加相关信息接口回调 + * @param cb 要添加的回调接口 + */ + fun addCallback(cb: IV2XCallback) { + if (cbs.contains(cb)) { + return + } + cbs += cb + } + + /** + * 移除相关信息接口回调 + * @param cb 要移除的回调接口 + */ + fun removeCallback(cb: IV2XCallback) { + if (!cbs.contains(cb)) { + return + } + cbs.remove(cb) + } + + fun updateCheck(longitude: Double, latitude: Double) { + realLongitude.set(longitude) + realLatitude.set(latitude) + val oldLon = lastLongitude.get() + val oldLat = lastLatitude.get() + var update = false + try { + if (oldLon == 0.0 || oldLat == 0.0) { + handler.removeCallbacks(refreshTask) + handler.post(refreshTask) + update = true + return + } + if (DistanceUtils.calculateLineDistance(oldLon, oldLat, longitude, latitude) >= 200f) { + handler.removeCallbacks(refreshTask) + handler.post(refreshTask) + update = true + } + } finally { + if (update) { + lastLatitude.set(latitude) + lastLongitude.set(longitude) + } + } + } + + /** + * 开启loop Poi事件 + */ + fun startLoopPoi() { + handler.removeCallbacks(refreshTask) + handler.post(refreshTask) + } + + private val refreshTask = object : Runnable { + override fun run() { + V2XRefreshModel.querySnapshot( + longitude = realLongitude.get(), latitude = realLatitude.get(), + refreshCallback + ) + handler.postDelayed(this, TimeUnit.SECONDS.toMillis(60)) + } + } + + fun stopLoopPoi() { + handler.removeCallbacks(refreshTask) + lastLatitude.set(0.0) + lastLongitude.set(0.0) + } + + private val refreshCallback = object : IV2XRefreshCallback { + + override fun onSuccess(result: V2XMarkerResponse) { + cbs.forEach { + it.onAck(V2XEvent.Marker(result)) + } + } + + override fun onFail(msg: String?) { + cbs.forEach { + it.onFail(msg ?: "") + } + } + } + + + /** + * 查询全览路径上的事件信息 + */ + fun queryWholeRoadEvents() { + V2XRefreshModel.roadEventDispose() + val sn = MoGoAiCloudClientConfig.getInstance().sn + val lineId = getLineId() + if (lineId > 0) { + realQueryV2xEvents(lineId.toString(), sn) + } else { + UiThreadHandler.postDelayed({ + realQueryV2xEvents(getLineId().toString(), sn) + }, 500) + } + } + + private fun getLineId(): Long { + var lineId: Long = -1 + val parameter = CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo() + .autopilotControlParameters + if (parameter != null) { + if (parameter.autoPilotLine != null) { + lineId = parameter.autoPilotLine!!.lineId + CallerLogger.d(SceneConstant.M_V2X + TAG, "lineId为:$lineId") + } else { + CallerLogger.d(SceneConstant.M_V2X + TAG, "parameter.autoPilotLine为null") + } + } else { + CallerLogger.d(SceneConstant.M_V2X + TAG, "parameter为null") + } + return lineId + } + + private fun realQueryV2xEvents(lineId: String, sn: String) { + V2XRefreshModel.getRoadEvents(lineId, sn) { + val size = it?.size ?: 0 + if (size > 0) { + val msgBoxBean = + MsgBoxBean(MsgBoxType.V2X, V2XMsg("", "查询到当前全程共${size}个事件", "")) + msgBoxBean.sourceType = DataSourceType.SUMMARY + CallerMsgBoxManager.saveMsgBox(msgBoxBean) + } + } + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoV2XMarkerManager.java index fdfe8dec63..ed87273009 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoV2XMarkerManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoV2XMarkerManager.java @@ -6,7 +6,7 @@ import com.alibaba.android.arouter.facade.template.IProvider; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; -import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerCardResult; +import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java index 327a28d209..932164de80 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java @@ -19,11 +19,8 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths; import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XMarkerManager; import com.mogo.eagle.core.function.v2x.events.marker.V2XMarkerAdapter; -import com.mogo.eagle.core.function.v2x.events.utils.EntityUtilsKt; import com.mogo.eagle.core.function.v2x.events.utils.MapUtils; -import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerCardResult; -import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerExploreWay; -import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerLocation; +import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.map.marker.IMogoMarker; import com.mogo.map.marker.IMogoMarkerClickListener; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java index 5ee305f4b3..9350454df4 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java @@ -23,7 +23,7 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager; import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario; import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; -import com.mogo.eagle.core.function.v2x.internal.data.V2XWarningTarget; +import com.mogo.eagle.core.data.v2x.V2XWarningTarget; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import java.math.BigDecimal; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java index b81750d42c..c0ca15c5cb 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java @@ -18,8 +18,8 @@ import com.mogo.eagle.core.function.v2x.events.manager.IMoGoPersonWarnPolylineMa import com.mogo.eagle.core.function.v2x.events.manager.IMoGoStopPolylineManager; import com.mogo.eagle.core.function.v2x.events.manager.IMoGoWarnPolylineManager; import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; -import com.mogo.eagle.core.function.v2x.internal.data.V2XLocation; -import com.mogo.eagle.core.function.v2x.internal.data.V2XWarningTarget; +import com.mogo.eagle.core.data.v2x.V2XLocation; +import com.mogo.eagle.core.data.v2x.V2XWarningTarget; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.mogo.thread.WorkThreadHandler; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt index 0b8602e86e..69c1369b52 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt @@ -5,8 +5,9 @@ import com.mogo.eagle.core.data.enums.EventTypeEnumNew.Companion.isRoadEvent import com.mogo.eagle.core.data.map.entity.MarkerExploreWay import com.mogo.eagle.core.data.map.entity.MarkerLocation import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity +import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult +import com.mogo.eagle.core.data.v2x.V2XRoadXData import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.AiRoadMarker -import com.mogo.eagle.core.function.v2x.internal.data.* import com.mogo.eagle.core.utilcode.util.CoordinateTransform import mogo.telematics.pad.MessagePad import roadwork.Road diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/V2XManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/V2XManager.kt deleted file mode 100755 index 1245d6244f..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/V2XManager.kt +++ /dev/null @@ -1,257 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal - -import android.os.Handler -import android.os.Looper -import com.mogo.cloud.passport.MoGoAiCloudClientConfig -import com.mogo.cloud.socket.SocketManager -import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback -import com.mogo.eagle.core.function.v2x.internal.config.V2XConfig -import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerResponse -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent -import com.mogo.eagle.core.function.v2x.internal.http.V2XRefreshModel -import com.mogo.eagle.core.function.v2x.internal.http.callback.IV2XRefreshCallback -import com.mogo.eagle.core.function.v2x.internal.logger.V2XLogger -import com.mogo.eagle.core.function.v2x.internal.socket.* -import com.mogo.eagle.core.function.v2x.internal.socket.V2XMessageListener_401012 -import com.mogo.eagle.core.function.v2x.internal.socket.V2XMessageListener_401018 -import com.mogo.eagle.core.function.v2x.internal.socket.V2XMessageListener_402000 -import com.mogo.eagle.core.function.v2x.internal.socket.V2XMessageListener_404000 -import com.mogo.eagle.core.function.v2x.internal.utils.DistanceUtils -import java.util.concurrent.CopyOnWriteArrayList -import java.util.concurrent.atomic.AtomicBoolean -import java.util.concurrent.atomic.AtomicReference - -object V2XManager { - - internal const val TAG = "V2XManager" - - private val config: AtomicReference by lazy { - AtomicReference(null) - } - - private val cbs by lazy { - CopyOnWriteArrayList() - } - - private val lastLongitude by lazy { - AtomicReference(0.0) - } - - private val lastLatitude by lazy { - AtomicReference(0.0) - } - - private val realLongitude by lazy { AtomicReference(0.0) } - - private val realLatitude by lazy { AtomicReference(0.0) } - - - - /** - * 标识此参数是否启动 - */ - private val started by lazy { - AtomicBoolean(false) - } - - private val refreshCallback = object : IV2XRefreshCallback { - - override fun onSuccess(result: V2XMarkerResponse) { - cbs.forEach { - it.onAck(V2XEvent.Marker(result)) - } - } - - override fun onFail(msg: String?) { - cbs.forEach { - it.onFail(msg ?: "") - } - } - } - - - private val refreshTask = object : Runnable { - override fun run() { - V2XRefreshModel.querySnapshot(longitude = realLongitude.get(), latitude = realLatitude.get(), refreshCallback) - handler.postDelayed(this, config.get().durationForTriggerRefresh) - } - } - - private val handler by lazy { - Handler(Looper.getMainLooper()) - } - - /** - * 根据所配置的参数，初始化V2X相关功能（注: 此方法不要重复调用，非首次调用会抛异常） - * @param config 相关配置类 - */ - fun init(config: V2XConfig) { - V2XLogger.d(TAG, "-- init --") - if (V2XManager.config.get() != null) { - throw IllegalStateException("V2XManager has been initialized, don't initialize repeatably.") - } - V2XManager.config.set(config) - V2XLogger.loggable = config.loggable - } - - /** - * - 开启V2X功能, 此方法调用前，要确保满足以下两个条件： - * 1.初始化方法[init]已调用 - * 2.确保[MoGoAiCloudClientConfig.sn]和[MoGoAiCloudClientConfig.token]两个值存在，如果其中有一个值不存在，不会启动相关功能 - * - 此函数的功能如下： - * 1.建立长链接[SocketManager.init] - * 2.位置上报服务[LocationManager.init]和[LocationManager.start] - * 3.短链[V2XRefreshModel.querySnapshot]定时轮循,轮循时长取[V2XConfig.durationForTriggerRefresh] - */ - fun start() { - V2XLogger.d(TAG, "-- start --") - val config = config.get() ?: throw IllegalStateException("V2XManager has not been initialized, please invoke V2XManager#init(config: X2XConfig) firstly.") - if (started.get()) { - V2XLogger.d(TAG, "-- has been started --") - return - } - if (config.aiCloudConfig.sn?.isBlank() == true) { - V2XLogger.e(TAG, "sn is null or blank, please ensure sn exists and then invoke V2XManager#start() again.") - cbs.forEach { - it.onFail("sn is null or blank, please ensure sn exists and then invoke V2XManager#start() again.") - } - return - } - if (config.aiCloudConfig.token?.isBlank() == true) { - V2XLogger.e(TAG, "token is null or blank, please ensure token exists and then invoke V2Manager#start() again.") - cbs.forEach { - it.onFail("token is null or blank, please ensure token exists and then invoke V2Manager#start() again.") - } - return - } - if (started.compareAndSet(false, true)) { - V2XLogger.d(TAG, "-- start real --") - SocketManager.getInstance().init(config.context,0.0,0.0) - SocketManager.getInstance().registerOnMessageListener(401012, V2XMessageListener_401012(cbs)) - SocketManager.getInstance().registerOnMessageListener(401018, V2XMessageListener_401018(cbs)) - SocketManager.getInstance().registerOnMessageListener(402000, V2XMessageListener_402000(cbs)) - SocketManager.getInstance().registerOnMessageListener(404000, V2XMessageListener_404000(cbs)) - //SocketManager.getInstance().registerOnMessageListener(503000, V2XMessageListener_503000(cbs)) - SocketManager.getInstance().registerOnMessageListener(70001, V2XMessageListener_70001(cbs)) - handler.post(refreshTask) - } - } - - /** - * @param sn 更新后的sn - * @param token 更新后的token - */ - fun updateSnAndToken(sn: String?, token: String?) { - val config = config.get() ?: throw IllegalStateException("V2XManager has not been initialized, please invoke V2XManager#init(config: X2XConfig) firstly.") - sn ?: return - token ?: return - if (started.get()) { - return - } - config.aiCloudConfig.sn = sn - config.aiCloudConfig.token = token - start() - } - - /** - * 停止V2X功能 - * 1. 断开长链接[SocketManager.release] - * 2. 停止位置上报[LocationManager.stop] - * 3. 取消短链定时轮循任务 - */ - fun stop() { - V2XLogger.d(TAG, "-- stop --") - if (config.get() == null) { - throw IllegalStateException("V2XManager has not been initialized, please invoke V2XManager#init(config: X2XConfig) firstly.") - } - if (started.compareAndSet(true, false)) { - V2XLogger.d(TAG, "-- stop real --") - SocketManager.getInstance().release() - handler.removeCallbacks(refreshTask) - lastLatitude.set(0.0) - lastLongitude.set(0.0) - } - } - - /** - * 添加相关信息接口回调 - * @param cb 要添加的回调接口 - */ - fun addCallback(cb: IV2XCallback) { - V2XLogger.d(TAG, "-- addCallback --") - if (cbs.contains(cb)) { - return - } - cbs += cb - } - - /** - * 移除相关信息接口回调 - * @param cb 要移除的回调接口 - */ - fun removeCallback(cb: IV2XCallback) { - V2XLogger.d(TAG, "-- removeCallback --") - if (!cbs.contains(cb)) { - return - } - cbs.remove(cb) - } - - /** - * 当自车位置变量时调用 - * @param longitude 自车所在精度 - * @param latitude 自车所在纬度 - */ - fun onLocationChanged(longitude: Double, latitude: Double) { - if (config.get() == null) { - throw IllegalStateException("V2XManager has not been initialized, please invoke V2XManager#init(config: X2XConfig) firstly.") - } - if (!started.get()) { - return - } - //V2XLogger.d(TAG, "--- onLocationChanged --[longitude: $longitude, latitude: $latitude]") - realLongitude.set(longitude) - realLatitude.set(latitude) - val oldLon = lastLongitude.get() - val oldLat = lastLatitude.get() - var update = false - try { - if (oldLon == 0.0 || oldLat == 0.0) { - V2XLogger.d(TAG, "--- onLocationChanged -- first --[longitude: $longitude, latitude: $latitude]") - handler.removeCallbacks(refreshTask) - handler.post(refreshTask) - update = true - return - } - if (DistanceUtils.calculateLineDistance(oldLon, oldLat, longitude, latitude) >= config.get().distanceForTriggerRefresh) { - V2XLogger.d(TAG, "--- onLocationChanged -- trigger --[longitude: $longitude, latitude: $latitude]") - handler.removeCallbacks(refreshTask) - handler.post(refreshTask) - update = true - } - } finally { - if (update) { - lastLatitude.set(latitude) - lastLongitude.set(longitude) - } - } - } - - /** - * 是否已经初始化 - * @return true: 已初始化过 false: 未初始化 - */ - fun hasInit() = getConfig() != null - - /** - * 强制刷新道路事件 - */ - fun forceRefresh() { - if (hasInit()) { - handler.removeCallbacks(refreshTask) - handler.post(refreshTask) - } - } - - internal fun getConfig() = config.get() -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/callback/IV2XCallback.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/callback/IV2XCallback.kt index f755c465e4..4a4d0e2b78 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/callback/IV2XCallback.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/callback/IV2XCallback.kt @@ -1,6 +1,6 @@ package com.mogo.eagle.core.function.v2x.internal.callback -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent +import com.mogo.eagle.core.data.v2x.V2XEvent interface IV2XCallback { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/config/V2XConfig.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/config/V2XConfig.kt deleted file mode 100755 index 1ab70b67ac..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/config/V2XConfig.kt +++ /dev/null @@ -1,174 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.config - -import android.content.Context -import com.mogo.cloud.passport.MoGoAiCloudClientConfig -import com.mogo.eagle.core.function.v2x.internal.executor.Executors -import java.util.concurrent.Executor -import java.util.concurrent.TimeUnit -import kotlin.IllegalStateException - -/** - * V2X相关配置 - */ -class V2XConfig private constructor(builder: Builder) { - - /** - * - 应用上下文 - * - 必选项 - * - 通过[Builder.context]设置 - */ - val context : Context by lazy { - builder.context?.applicationContext ?: throw IllegalStateException("context must not be null.") - } - - /** - * - 云平台配置参数 - * - 必选项 - * - 通过[Builder.aiCloudConfig]设置 - */ - val aiCloudConfig by lazy { - builder.aiCloudConfig ?: throw IllegalStateException("aiCloudConfig must not be null.") - } - - /** - * - 网络请求使用的线程池，IO类型 - * - 可选项 - * - 通过[Builder.executor]设置 - */ - val executor: Executor by lazy { - builder.executor ?: Executors.IO - } - - /** - * - 是否开启日志 - * - 可选项 - * - 通过[Builder.loggable]设置，开发阶段可以打开，应用发布后记得关闭 - */ - val loggable: Boolean by lazy { - builder.loggable - } - - /** - * - 公共参数, 默认为空 - * - 可选项 - * - 通过[Builder.staticParams]设置 - */ - val staticParams by lazy { - builder.staticParams ?: HashMap() - } - - /** - * - 基础Url, 默认值为`http://dzt-launcherSnapshot.zhidaozhixing.com` - * - 可选项 - * - 通过[Builder.baseUrl]设置 - */ - val baseUrl by lazy { - builder.baseUrl ?: "http://dzt-launcherSnapshot.zhidaozhixing.com" - - } - - /** - * - 多长时间请求一次自车周边信息，单位为毫秒，默认值为`6_000`毫秒 - * - 可选项 - * - 通过[Builder.durationForTriggerRefresh]设置 - */ - val durationForTriggerRefresh by lazy { - val duration = builder.durationForTriggerRefresh - if (duration == null || duration <= 0) TimeUnit.SECONDS.toMillis(60) else duration - } - - /** - * - 自车行驶超过此长度，会刷新自车周边信息，单位为`米` - * - 可选项 - * - 通过[Builder.distanceForTriggerRefresh]设置 - */ - val distanceForTriggerRefresh: Float by lazy { - val distance = builder.distanceForTriggerRefresh - if (distance == null || distance <= 0) 200f else distance - } - - internal fun newBuilder() = Builder(this) - - class Builder { - - internal var context: Context? = null - - internal var executor: Executor? = null - - internal var loggable: Boolean = false - - internal var staticParams: Map? = null - - internal var aiCloudConfig: MoGoAiCloudClientConfig? = null - - internal var durationForTriggerRefresh: Long? = null - - internal var baseUrl: String? = null - - internal var distanceForTriggerRefresh: Float? = null - - constructor() - - internal constructor(config: V2XConfig) { - context = config.context - executor = config.executor - loggable = config.loggable - baseUrl = config.baseUrl - staticParams = config.staticParams - aiCloudConfig = config.aiCloudConfig - durationForTriggerRefresh = config.durationForTriggerRefresh - distanceForTriggerRefresh = config.distanceForTriggerRefresh - } - - /** - * 应用上下文，此参数为必选项，不设置会抛异常 - */ - fun context(context: Context) = apply { this.context = context } - - /** - * 是否开启日志 - */ - fun loggable(loggable: Boolean) = apply { this.loggable = loggable } - - /** - * 公共参数列表 - */ - fun staticParams(params: Map) = apply { this.staticParams = params } - - /** - * 网络请求线程池，如未设置，会使用内置的线程池[Executors.IO] - */ - fun executor(executor: Executor): Builder = apply { - if (this.executor != null) { - throw IllegalArgumentException("io executor has been initialized, don't set repeatedly.") - } - this.executor = executor - } - - /** - * 刷新周边信息的时间间隔 - * @param duration 时长 - * @param unit 时间单位 - */ - fun durationForTriggerRefresh(duration: Long, unit: TimeUnit = TimeUnit.SECONDS) = apply { this.durationForTriggerRefresh = unit.toMillis(duration) } - - /** - * @param distance 超过此距离会触发刷新周边道路信息，单位为米 - */ - fun distanceForTriggerRefresh(distance: Float) = apply { this.distanceForTriggerRefresh = distance } - - /** - * 云平台配置信息,此参数为必选项，不设置会抛异常 - * @param config 云平台配置 - */ - fun aiCloudConfig(config: MoGoAiCloudClientConfig) = apply { this.aiCloudConfig = config } - - /** - * 云平台baseUrl - * @param baseUrl 云平台baseUrl - */ - fun baseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl } - - fun build() : V2XConfig = V2XConfig(this) - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/event/V2XEvent.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/event/V2XEvent.kt deleted file mode 100644 index 40bf0b65c4..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/event/V2XEvent.kt +++ /dev/null @@ -1,75 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.event - -import com.mogo.eagle.core.function.v2x.internal.data.* -import roadwork.Road.RW_PB - -sealed class V2XEvent { - - /** - * 长链-路口碰撞预警、盲区预警等通用Bean - */ - class ForwardsWarning(val type: Int = 404000, val data: V2XAdvanceWarning): V2XEvent() { - override fun toString(): String { - return "ForwardsWarning(type=$type, data=$data)" - } - } - - /** - * 长链-最优推荐线种 - */ - class OptimalRoute(val type: Int = 402000, val data: V2XOptimalRoute): V2XEvent() { - override fun toString(): String { - return "OptimalRoute(type=$type, data=$data)" - } - } - - /** - * 长链-预警目标物 - */ - class Warning(val type: Int = 401018, val data: V2XWarningTarget): V2XEvent() { - override fun toString(): String { - return "Warning(type=$type, data=$data)" - } - } - - /** - * 长链-道路事件 - */ - class Road(val type: Int = 401012, val data: V2XMarkerCardResult): V2XEvent() { - override fun toString(): String { - return "Road(type=$type, data=$data)" - } - } - - /** - * 长链-道路事件云识别 - */ - class RoadAI(val type: Int = 503000, val data: RW_PB): V2XEvent() { - - override fun toString(): String { - return "RoadAI(type=$type, data=$data)" - } - } - - - /** - * 短链-道路标记事件 - */ - class Marker(val data: V2XMarkerResponse): V2XEvent() { - - override fun toString(): String { - return "Marker(data=$data)" - } - } - - - /** - * 长链-道路事件扩展数据结构 - */ - class RoadEventX(val type: Int = 70001, val data: V2XRoadXData): V2XEvent() { - - override fun toString(): String { - return "RoadEventX(type=$type, data=$data)" - } - } -} diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/executor/Executors.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/executor/Executors.kt deleted file mode 100755 index aed7f4549c..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/executor/Executors.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.executor - -import java.util.concurrent.* -import java.util.concurrent.atomic.AtomicLong -import kotlin.math.max -import kotlin.math.min - - -internal object Executors { - - private val group: ThreadGroup by lazy { - ThreadGroup("v2x-group") - } - - private val CPU_CORE_COUNT by lazy { - Runtime.getRuntime().availableProcessors() - } - - private val DEFAULT_CORE_COUNT by lazy { - (max(2, min(CPU_CORE_COUNT - 1, 6)) * 3) + 1 - } - - private const val DEFAULT_MAX_COUNT_4_IO = 128 - - val IO by lazy { - val idGenerator = AtomicLong(0) - ThreadPoolExecutor( - DEFAULT_CORE_COUNT, DEFAULT_MAX_COUNT_4_IO, 30, TimeUnit.SECONDS, LinkedBlockingDeque() - ) { r -> - Thread(group, r).apply { - name = "io-thread-${idGenerator.getAndIncrement()}" - } - } - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/V2XRefreshModel.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/V2XRefreshModel.kt index f3e8a4f56a..d24d8004c9 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/V2XRefreshModel.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/V2XRefreshModel.kt @@ -4,14 +4,25 @@ import com.elegant.network.utils.GsonUtil import com.elegant.network.utils.SignUtil import com.elegant.utils.CommonUtils import com.mogo.cloud.network.RetrofitFactory +import com.mogo.cloud.passport.MoGoAiCloudClientConfig +import com.mogo.commons.AbsMogoApplication import com.mogo.commons.constants.HostConst -import com.mogo.eagle.core.function.v2x.internal.V2XManager -import com.mogo.eagle.core.function.v2x.internal.config.V2XConfig -import com.mogo.eagle.core.function.v2x.internal.data.V2XLocation -import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerResponse +import com.mogo.commons.network.ParamsUtil +import com.mogo.eagle.core.data.enums.DataSourceType +import com.mogo.eagle.core.data.msgbox.MsgBoxBean +import com.mogo.eagle.core.data.msgbox.MsgBoxType +import com.mogo.eagle.core.data.msgbox.V2XMsg +import com.mogo.eagle.core.data.v2x.V2XEventData +import com.mogo.eagle.core.data.v2x.V2XLocation +import com.mogo.eagle.core.data.v2x.V2XMarkerResponse +import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager +import com.mogo.eagle.core.function.v2x.events.V2XPoiLoader import com.mogo.eagle.core.function.v2x.internal.http.api.V2XApiService import com.mogo.eagle.core.function.v2x.internal.http.body.V2XRefreshEntity import com.mogo.eagle.core.function.v2x.internal.http.callback.IV2XRefreshCallback +import com.mogo.eagle.core.network.MoGoRetrofitFactory +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.DeviceUtils import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable @@ -21,17 +32,18 @@ internal class V2XRefreshModel { companion object { + private const val TAG = "V2XRefreshModel" + fun querySnapshot( longitude: Double, latitude: Double, callback: IV2XRefreshCallback? ): Disposable? { - val config = V2XManager.getConfig() val retrofit = RetrofitFactory.getInstance(HostConst.getEagleHost()) ?: return null return retrofit .create(V2XApiService::class.java) - .querySnapshotSync(buildParams(longitude, latitude, config)) - .subscribeOn(Schedulers.from(config.executor)) + .querySnapshotSync(buildParams(longitude, latitude)) + .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe({ data -> if (data == null) { @@ -51,9 +63,8 @@ internal class V2XRefreshModel { private fun buildParams( longitude: Double, latitude: Double, - config: V2XConfig ): Map = mutableMapOf().apply { - putAll(config.staticParams.let { + putAll(ParamsUtil.getStaticParams().let { val handled = mutableMapOf() it.asIterable().forEach { itx -> val value = itx.value @@ -63,10 +74,10 @@ internal class V2XRefreshModel { } handled }) - this["netType"] = CommonUtils.getNetworkType(config.context) + this["netType"] = CommonUtils.getNetworkType(AbsMogoApplication.getApp()) this["cellId"] = DeviceUtils.getCellId() ?: "" - this["sn"] = config.aiCloudConfig.sn - this["ticket"] = config.aiCloudConfig.token + this["sn"] = MoGoAiCloudClientConfig.getInstance().sn + this["ticket"] = MoGoAiCloudClientConfig.getInstance().token this["sig"] = SignUtil.createSign(this, "JGjZx6") this["data"] = GsonUtil.jsonFromObject(V2XRefreshEntity().apply { limit = 999 @@ -79,6 +90,34 @@ internal class V2XRefreshModel { viewPush = true }) } + + private var v2xEventDisposable: Disposable? = null + + fun roadEventDispose(){ + if (v2xEventDisposable != null && !v2xEventDisposable!!.isDisposed) { + v2xEventDisposable!!.dispose() + } + } + + fun getRoadEvents(lineId: String, sn: String, onSuccess:((List?) -> Unit)){ + v2xEventDisposable = MoGoRetrofitFactory.getInstance(HostConst.getHost()) + .create(V2XApiService::class.java) + .queryAllV2XEventsByLineId(lineId, sn) + .map { + if (it.code == 200 || it.code == 0) { + CallerLogger.d(SceneConstant.M_V2X + TAG, "请求成功，size为：${it.result?.v2XEventList?.size}") + return@map it.result?.v2XEventList + } else { + CallerLogger.d(SceneConstant.M_V2X + TAG, "请求失败，code为：${it.code}") + return@map ArrayList() + } + } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { + onSuccess.invoke(it) + } + } } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/api/V2XApiService.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/api/V2XApiService.kt index 1b9bc293db..2ebb219093 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/api/V2XApiService.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/api/V2XApiService.kt @@ -1,14 +1,18 @@ package com.mogo.eagle.core.function.v2x.internal.http.api -import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerResponse +import com.mogo.eagle.core.data.v2x.V2XEventResult +import com.mogo.eagle.core.data.v2x.V2XMarkerResponse import io.reactivex.Maybe -import retrofit2.http.FieldMap -import retrofit2.http.FormUrlEncoded -import retrofit2.http.POST +import io.reactivex.Observable +import retrofit2.http.* internal interface V2XApiService { @FormUrlEncoded @POST("eagle-eye-dns/yycp-launcherSnapshot/launcherSnapshot/querySnapshotSync") fun querySnapshotSync(@FieldMap parameters: Map): Maybe + + @GET("/eagleEye-mis/config/queryV2NInformation") + fun queryAllV2XEventsByLineId(@Query("lineId") lineId: String, @Query("sn") sn: String): Observable + } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/body/V2XRefreshEntity.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/body/V2XRefreshEntity.kt index 82d5661ab5..d99ce1dac4 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/body/V2XRefreshEntity.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/body/V2XRefreshEntity.kt @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.v2x.internal.http.body import androidx.annotation.Keep -import com.mogo.eagle.core.function.v2x.internal.data.V2XLocation +import com.mogo.eagle.core.data.v2x.V2XLocation /** * 刷新地图信息接口 diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/logger/V2XLogger.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/logger/V2XLogger.kt deleted file mode 100644 index 58463eb45c..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/logger/V2XLogger.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.logger - -import android.util.Log - -internal object V2XLogger { - - var loggable: Boolean = false - - fun v(tag: String, msg: String) = if (loggable) Log.v(tag, msg) else 0 - - fun d(tag: String, msg: String) = if (loggable) Log.d(tag, msg) else 0 - - fun i(tag: String, msg: String) = if (loggable) Log.i(tag, msg) else 0 - - fun w(tag: String, msg: String) = if (loggable) Log.w(tag, msg) else 0 - - fun e(tag: String, msg: String, t: Throwable? = null) = if (loggable) { - if (t == null) { - Log.e(tag, msg) - } else { - Log.e(tag, msg, t) - } - } else 0 -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_401012.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_401012.kt deleted file mode 100644 index 23ca38f148..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_401012.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.socket - -import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener -import com.mogo.eagle.core.function.v2x.internal.V2XManager -import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback -import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerCardResult -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent -import com.mogo.eagle.core.function.v2x.internal.logger.V2XLogger - -internal class V2XMessageListener_401012(val cbs: Iterable?): IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = V2XMarkerCardResult::class.java - - override fun onMsgReceived(msgType: Int, data: V2XMarkerCardResult?) { - if (msgType != 401012) { - return - } - if (data == null) { - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_401012：message is null!") - return - } - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_401012:$data") - cbs?.forEach { - it.onAck(V2XEvent.Road(data = data)) - } - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_401018.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_401018.kt deleted file mode 100644 index a7cf8e8933..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_401018.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.socket - -import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener -import com.mogo.eagle.core.function.v2x.internal.V2XManager -import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent -import com.mogo.eagle.core.function.v2x.internal.data.V2XWarningTarget -import com.mogo.eagle.core.function.v2x.internal.logger.V2XLogger - -internal class V2XMessageListener_401018(val cbs: Iterable?): IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = V2XWarningTarget::class.java - - override fun onMsgReceived(msgType: Int, data: V2XWarningTarget?) { - if (msgType != 401018) { - return - } - if (data == null) { - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_401018：message is null!") - return - } - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_401018:$data") - cbs?.forEach { - it.onAck(V2XEvent.Warning(data = data)) - } - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_402000.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_402000.kt deleted file mode 100644 index e5b94036de..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_402000.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.socket - -import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener -import com.mogo.eagle.core.function.v2x.internal.V2XManager -import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback -import com.mogo.eagle.core.function.v2x.internal.data.V2XOptimalRoute -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent -import com.mogo.eagle.core.function.v2x.internal.logger.V2XLogger - -internal class V2XMessageListener_402000(val cbs: Iterable?): IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = V2XOptimalRoute::class.java - - override fun onMsgReceived(msgType: Int, data: V2XOptimalRoute?) { - if (msgType != 402000) { - return - } - if (data == null) { - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_402000：message is null!") - return - } - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_402000:$data") - cbs?.forEach { - it.onAck(V2XEvent.OptimalRoute(data = data)) - } - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_404000.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_404000.kt deleted file mode 100644 index c8b402cedd..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_404000.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.socket - -import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener -import com.mogo.eagle.core.function.v2x.internal.V2XManager -import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback -import com.mogo.eagle.core.function.v2x.internal.data.V2XAdvanceWarning -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent -import com.mogo.eagle.core.function.v2x.internal.logger.V2XLogger - -internal class V2XMessageListener_404000(val cbs: Iterable?): IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = V2XAdvanceWarning::class.java - - override fun onMsgReceived(msgType: Int, data: V2XAdvanceWarning?) { - if (msgType != 404000) { - return - } - if (data == null) { - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_404000：message is null!") - return - } - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_404000:$data") - cbs?.forEach { - it.onAck(V2XEvent.ForwardsWarning(data = data)) - } - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_503000.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_503000.kt deleted file mode 100644 index dbfc7f7ff4..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_503000.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.socket - -import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener -import com.mogo.eagle.core.function.v2x.internal.V2XManager -import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent.RoadAI -import com.mogo.eagle.core.function.v2x.internal.logger.V2XLogger -import roadwork.Road.RW_PB - -internal class V2XMessageListener_503000(val cbs: Iterable?): IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = RW_PB::class.java - - override fun onMsgReceived(msgType: Int, data: RW_PB?) { - if (msgType != 503000) { - return - } - if (data == null) { - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_503000：message is null!") - return - } - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_503000:$data") - cbs?.forEach { - it.onAck(RoadAI(data = data)) - } - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_70001.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_70001.kt deleted file mode 100644 index 320b6529d4..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/socket/V2XMessageListener_70001.kt +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.eagle.core.function.v2x.internal.socket - -import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener -import com.mogo.eagle.core.function.v2x.internal.V2XManager -import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback -import com.mogo.eagle.core.function.v2x.internal.data.V2XRoadXData -import com.mogo.eagle.core.function.v2x.internal.event.V2XEvent -import com.mogo.eagle.core.function.v2x.internal.logger.V2XLogger - -internal class V2XMessageListener_70001(val cbs: Iterable?): IMogoCloudSocketOnMessageListener { - - override fun target(msgType: Int): Class = V2XRoadXData::class.java - - override fun onMsgReceived(msgType: Int, data: V2XRoadXData?) { - if (msgType != 70001) { - return - } - if (data == null) { - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_70001：message is null!") - return - } - V2XLogger.i(V2XManager.TAG, "V2XMessageListener_70001:$data") - cbs?.forEach { - it.onAck(V2XEvent.RoadEventX(data = data)) - } - } -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/road/V2XEventServiceApi.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/road/V2XEventServiceApi.kt deleted file mode 100644 index 5b73866375..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/road/V2XEventServiceApi.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.mogo.eagle.core.function.v2x.road - -import io.reactivex.Observable -import retrofit2.http.GET -import retrofit2.http.Query - -interface V2XEventServiceApi { - - @GET("/eagleEye-mis/config/queryV2NInformation") - fun queryAllV2XEventsByLineId(@Query("lineId") lineId: String, @Query("sn") sn: String): Observable -} \ No newline at end of file diff --git a/core/mogo-core-data/build.gradle b/core/mogo-core-data/build.gradle index 4bda16c773..6bbadbc935 100644 --- a/core/mogo-core-data/build.gradle +++ b/core/mogo-core-data/build.gradle @@ -4,6 +4,7 @@ plugins { id 'kotlin-android-extensions' id 'kotlin-kapt' id 'com.alibaba.arouter' + id 'com.google.protobuf' } android { compileSdkVersion rootProject.ext.android.compileSdkVersion @@ -46,6 +47,19 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + protobuf { + protoc { + artifact = rootProject.ext.dependencies.protoc + } + generateProtoTasks { + all().each { task -> + task.builtins { + java {} + } + } + } + } + } dependencies { @@ -61,6 +75,9 @@ dependencies { implementation rootProject.ext.dependencies.androidxroomktx kapt rootProject.ext.dependencies.androidxroomcompiler + implementation rootProject.ext.dependencies.protobuf_java + implementation rootProject.ext.dependencies.protobuf_java_util + if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogo_core_res } else { diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index f319c9556a..c75a31e8cd 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -54,6 +54,12 @@ public class MogoServicePaths { @Keep public static final String PATH_AUTO_PILOT = "/auto_pilot/api"; + /** + * AiCloud socket 数据透出业务模块 + */ + @Keep + public static final String PATH_AI_CLOUD = "/ai_cloud/api"; + /** * 业务Biz 模块 */ @@ -93,7 +99,6 @@ public class MogoServicePaths { @Keep public static final String PATH_DATA_CENTER_MODULE = "/data_center/api"; - @Keep public static final String PATH_IDENTIFY = "/map/identify"; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XAdvanceWarning.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XAdvanceWarning.kt similarity index 97% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XAdvanceWarning.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XAdvanceWarning.kt index df71ca8175..64c2962c37 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XAdvanceWarning.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XAdvanceWarning.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.data +package com.mogo.eagle.core.data.v2x import androidx.annotation.Keep import java.io.Serializable diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XBaseData.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XBaseData.kt similarity index 64% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XBaseData.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XBaseData.kt index d7df5b04f0..4f2b36d406 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XBaseData.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XBaseData.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.data +package com.mogo.eagle.core.data.v2x open class V2XBaseData { diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XEvent.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XEvent.kt index c9c1bbb61e..322e89b0e1 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XEvent.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XEvent.kt @@ -1,59 +1,70 @@ package com.mogo.eagle.core.data.v2x -import androidx.annotation.Keep +sealed class V2XEvent { -import com.google.gson.annotations.SerializedName + /** + * 长链-路口碰撞预警、盲区预警等通用Bean + */ + class ForwardsWarning(val type: Int = 404000, val data: V2XAdvanceWarning): V2XEvent() { + override fun toString(): String { + return "ForwardsWarning(type=$type, data=$data)" + } + } -@Keep -data class V2XEvent( - @SerializedName("receiveTime") - var receiveTime: Long, + /** + * 长链-最优推荐线种 + */ + class OptimalRoute(val type: Int = 402000, val data: V2XOptimalRoute): V2XEvent() { + override fun toString(): String { + return "OptimalRoute(type=$type, data=$data)" + } + } - @SerializedName("detectTime") - var detectTime: Long, + /** + * 长链-预警目标物 + */ + class Warning(val type: Int = 401018, val data: V2XWarningTarget): V2XEvent() { + override fun toString(): String { + return "Warning(type=$type, data=$data)" + } + } - @SerializedName("id") - var id: String?, + /** + * 长链-道路事件 + */ + class Road(val type: Int = 401012, val data: V2XMarkerCardResult): V2XEvent() { + override fun toString(): String { + return "Road(type=$type, data=$data)" + } + } - @SerializedName("center") - var center: Center?, + /** + * 长链-道路事件云识别 + */ + class RoadAI(val type: Int = 503000, val data: roadwork.Road.RW_PB): V2XEvent() { - @SerializedName("centerRoad") - var centerRoad: CenterRoad?, + override fun toString(): String { + return "RoadAI(type=$type, data=$data)" + } + } - @SerializedName("radius") - var radius: Double, + /** + * 短链-道路标记事件 + */ + class Marker(val data: V2XMarkerResponse): V2XEvent() { - @SerializedName("poiType") - var poiType: String?, + override fun toString(): String { + return "Marker(data=$data)" + } + } - @SerializedName("coordinateType") - var coordinateType:Int? = null -) + /** + * 长链-道路事件扩展数据结构 + */ + class RoadEventX(val type: Int = 70001, val data: V2XRoadXData): V2XEvent() { -@Keep -data class Center( - @SerializedName("lat") - var lat: Double, - - @SerializedName("lon") - var lon: Double -) - -@Keep -data class CenterRoad( - @SerializedName("bearing") - var bearing: Double, - - @SerializedName("laneNo") - var laneNo: Long, - - @SerializedName("roadId") - var roadId: String?, - - @SerializedName("roadName") - var roadName: String?, - - @SerializedName("tileId") - var tileId: Long -) \ No newline at end of file + override fun toString(): String { + return "RoadEventX(type=$type, data=$data)" + } + } +} diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/road/V2XEventResult.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XEventResult.kt similarity index 87% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/road/V2XEventResult.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XEventResult.kt index 7a98c26ab4..8d444bedc0 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/road/V2XEventResult.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XEventResult.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.road +package com.mogo.eagle.core.data.v2x import androidx.annotation.Keep @@ -15,11 +15,11 @@ data class V2XEventResult ( @Keep data class Result( @SerializedName("eventList") - var v2XEventList: List? + var v2XEventList: List? ) @Keep -data class V2XEvent( +data class V2XEventData( @SerializedName("receiveTime") var receiveTime: Long, @@ -33,7 +33,7 @@ data class V2XEvent( var center: Center?, @SerializedName("centerRoad") - var centerRoad: CenterRoad?, + var centerRoad: CenterRoadData?, @SerializedName("radius") var radius: Double, @@ -55,7 +55,7 @@ data class Center( ) @Keep -data class CenterRoad( +data class CenterRoadData( @SerializedName("bearing") var bearing: Double, diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XLocation.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XLocation.kt similarity index 87% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XLocation.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XLocation.kt index 3ce50a38f0..9b09a721c6 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XLocation.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XLocation.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.data +package com.mogo.eagle.core.data.v2x import androidx.annotation.Keep import java.io.Serializable diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XMarkerCardResult.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XMarkerCardResult.kt similarity index 99% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XMarkerCardResult.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XMarkerCardResult.kt index a486687d10..df4a3c2f5e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XMarkerCardResult.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XMarkerCardResult.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.data +package com.mogo.eagle.core.data.v2x import androidx.annotation.Keep import com.mogo.eagle.core.data.map.entity.MarkerExploreWay diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XMarkerResponse.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XMarkerResponse.kt similarity index 80% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XMarkerResponse.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XMarkerResponse.kt index 790bd71b0a..ee36ee0c9b 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XMarkerResponse.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XMarkerResponse.kt @@ -1,8 +1,7 @@ -package com.mogo.eagle.core.function.v2x.internal.data +package com.mogo.eagle.core.data.v2x import androidx.annotation.Keep import com.elegant.network.BaseResp -import com.mogo.eagle.core.function.v2x.internal.data.V2XMarkerCardResult import java.io.Serializable @Keep diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XOptimalRoute.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XOptimalRoute.kt similarity index 89% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XOptimalRoute.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XOptimalRoute.kt index dd27d302af..414b29895e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XOptimalRoute.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XOptimalRoute.kt @@ -1,7 +1,6 @@ -package com.mogo.eagle.core.function.v2x.internal.data +package com.mogo.eagle.core.data.v2x import androidx.annotation.Keep -import com.mogo.eagle.core.function.v2x.internal.data.V2XLocation import java.io.Serializable /** diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XRoadXEvent.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XRoadXEvent.kt similarity index 95% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XRoadXEvent.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XRoadXEvent.kt index a692c2dfa7..08882f868a 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XRoadXEvent.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XRoadXEvent.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.data +package com.mogo.eagle.core.data.v2x import androidx.annotation.Keep diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XWarningTarget.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XWarningTarget.kt similarity index 96% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XWarningTarget.kt rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XWarningTarget.kt index 8173032600..0dcecfaa99 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/data/V2XWarningTarget.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/v2x/V2XWarningTarget.kt @@ -1,7 +1,6 @@ -package com.mogo.eagle.core.function.v2x.internal.data +package com.mogo.eagle.core.data.v2x import androidx.annotation.Keep -import com.mogo.eagle.core.function.v2x.internal.data.V2XLocation import java.io.Serializable /** diff --git a/core/function-impl/mogo-core-function-v2x/src/main/proto/road.proto b/core/mogo-core-data/src/main/proto/road.proto similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/proto/road.proto rename to core/mogo-core-data/src/main/proto/road.proto diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IFuncBizProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IFuncBizProvider.kt similarity index 65% rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IFuncBizProvider.kt rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IFuncBizProvider.kt index d25c01434a..594d2cbfeb 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IFuncBizProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IFuncBizProvider.kt @@ -1,7 +1,7 @@ -package com.mogo.eagle.core.function.api.v2x +package com.mogo.eagle.core.function.api.biz import com.mogo.eagle.core.data.map.Infrastructure -import com.mogo.eagle.core.data.v2x.V2XEvent +import com.mogo.eagle.core.data.v2x.V2XEventData interface IFuncBizProvider { /** @@ -12,5 +12,5 @@ interface IFuncBizProvider { /** * 根据lineId获取整条道路的V2X事件 */ - fun onV2XEvents(v2xEvents: List?) {} + fun onV2XEvents(v2XEventData: List?) {} } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/cloud/IMoGoCloudListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/cloud/IMoGoCloudListener.kt index 89cf1c82cc..ac98d5713f 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/cloud/IMoGoCloudListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/cloud/IMoGoCloudListener.kt @@ -1,6 +1,25 @@ package com.mogo.eagle.core.function.api.cloud -interface IMoGoCloudListener { +import com.mogo.eagle.core.data.v2x.V2XEvent - fun tokenGot(token: String, sn: String) +interface IMoGoCloudListener{ + + fun tokenGot(token: String, sn: String){} + + /** + * 获取到V2X事件成功回调 + * @param event + * - 参数说明：目前此参数支持以下类型 + * - [V2XEvent.ForwardsWarning]: 路口碰撞预警、盲区预警等预警事件, 数据实体取自[V2XEvent.ForwardsWarning.data] + * - [V2XEvent.Road]: 道路事件, 数据实体取自[V2XEvent.Road.data] + * - [V2XEvent.Warning]: 预警目标物事件, 数据实体取自[V2XEvent.Warning.data] + * - [V2XEvent.Marker]: 道路标记事件, 数据实体取自[V2XEvent.Marker.data] + */ + fun onAck(event: V2XEvent){} + + /** + * V2X事件获取过程中，出现的异常信息，用于问题排查 + * @param msg 异常信息 + */ + fun onFail(msg: String){} } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxEventListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxEventListener.kt similarity index 91% rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxEventListener.kt rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxEventListener.kt index 8cd6469ae6..b6568d1187 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxEventListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxEventListener.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.api.msgbox +package com.mogo.eagle.core.function.api.datacenter.msgbox import com.mogo.eagle.core.data.msgbox.MsgBoxBean diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxListener.kt similarity index 82% rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxListener.kt rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxListener.kt index f09b416e68..bcd01a377e 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxListener.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.api.msgbox +package com.mogo.eagle.core.function.api.datacenter.msgbox import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgCategory diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxProvider.kt similarity index 93% rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxProvider.kt index 9dbac58bbd..78007ffe72 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/msgbox/IMsgBoxProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/msgbox/IMsgBoxProvider.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.api.msgbox +package com.mogo.eagle.core.function.api.datacenter.msgbox import android.content.Context import com.mogo.eagle.core.data.msgbox.MsgBoxBean diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/ILimitingVelocityListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/ILimitingVelocityListener.kt similarity index 82% rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/ILimitingVelocityListener.kt rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/ILimitingVelocityListener.kt index c47ab242d8..425d43aa73 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/ILimitingVelocityListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/ILimitingVelocityListener.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.api.v2x +package com.mogo.eagle.core.function.api.datacenter.union import com.mogo.eagle.core.data.enums.DataSourceType diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoTrafficLightListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt similarity index 96% rename from core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoTrafficLightListener.kt rename to core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt index 216a936e78..195217b4ae 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoTrafficLightListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/datacenter/union/IMoGoTrafficLightListener.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.api.v2x +package com.mogo.eagle.core.function.api.datacenter.union import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.TrafficLightEnum diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt index 7fd0976c7e..1edd553d64 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLocationGCJ02ListenerManager.kt @@ -16,7 +16,7 @@ import com.mogo.eagle.core.utilcode.util.TimeUtils */ object CallerChassisLocationGCJ02ListenerManager : CallerBase() { - val TAG = "CallerChassisLocationGCJ20ListenerManager" + private const val TAG = "CallerChassisLocationGCJ20ListenerManager" @Volatile private var mGnssInfo: MogoLocation? = null @@ -36,6 +36,8 @@ object CallerChassisLocationGCJ02ListenerManager : CallerBase() { @@ -24,10 +24,10 @@ object CallerFuncBizListenerManager: CallerBase() { } @MainThread - fun invokeV2XEvents(v2xEvents: List?) { + fun invokeV2XEvents(v2XEventData: List?) { M_LISTENERS.forEach { val listener = it.value - listener.onV2XEvents(v2xEvents) + listener.onV2XEvents(v2XEventData) } } } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/cloud/CallerCloudListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/cloud/CallerCloudListenerManager.kt index ca770c35ca..bed5a7977a 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/cloud/CallerCloudListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/cloud/CallerCloudListenerManager.kt @@ -1,61 +1,26 @@ package com.mogo.eagle.core.function.call.cloud +import com.mogo.eagle.core.data.v2x.V2XEvent import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener -import java.util.concurrent.ConcurrentHashMap +import com.mogo.eagle.core.function.call.base.CallerBase -object CallerCloudListenerManager { - - private val M_CLOUD_LISTENER: ConcurrentHashMap = - ConcurrentHashMap() - - /** - * 添加监听 - * @param tag 标记，用来注销监听使用 - * @param listener 监听回调 - */ - fun registerCloudListener( - tag: String, - listener: IMoGoCloudListener - ) { - if (M_CLOUD_LISTENER.containsKey(tag)) { - return - } - M_CLOUD_LISTENER[tag] = listener - } - - /** - * 删除监听 - * @param tag 标记，用来注销监听使用 - */ - fun unRegisterCloudListener(tag: String) { - if (!M_CLOUD_LISTENER.containsKey(tag)) { - return - } - M_CLOUD_LISTENER.remove(tag) - } - - /** - * 删除监听 - * @param listener 要删除的监听对象 - */ - fun unRegisterCloudListener(listener: IMoGoCloudListener) { - if (!M_CLOUD_LISTENER.containsValue(listener)) { - return - } - M_CLOUD_LISTENER.forEach { - if (it.value == listener) { - M_CLOUD_LISTENER.remove(it.key) - } - } - } +object CallerCloudListenerManager : CallerBase() { /** * 分发获取到的设备sn */ fun invokeCloudTokenGot(token: String, sn: String) { - M_CLOUD_LISTENER.forEach { + M_LISTENERS.forEach { val listener = it.value listener.tokenGot(token, sn) } } + + fun invokeSocketAck(event: V2XEvent) { + M_LISTENERS.forEach { + val listener = it.value + listener.onAck(event) + } + } + } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt index 1b2f35eff9..00b48eddf3 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt @@ -14,9 +14,6 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler * 小地图调用者管理，这里对外及其他模块提供小地图功能的调用，用啥写啥，不要过度设计，不允许直接将Provider暴露出去 */ object CallerSmpManager : CallerBase() { -// private val mogoSmallMapProvider: IMogoSmallMapProvider -// get() = ARouter.getInstance().build(MoGoFragmentPaths.PATH_FRAGMENT_SMP) -// .navigation() as IMogoSmallMapProvider private val v2xProvider: IV2XEventProvider get() = ARouter.getInstance().build(MogoServicePaths.PATH_V2X_MODULE) diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxEventListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxEventListenerManager.kt index 35470b458f..bc761537ec 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxEventListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxEventListenerManager.kt @@ -1,10 +1,8 @@ package com.mogo.eagle.core.function.call.msgbox -import androidx.annotation.Nullable import com.mogo.eagle.core.data.msgbox.MsgBoxBean -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxEventListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxEventListener import com.mogo.eagle.core.function.call.base.CallerBase -import java.util.concurrent.ConcurrentHashMap /** * @author XuXinChao diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxListenerManager.kt index 3117b859a5..ba89cc5e6d 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxListenerManager.kt @@ -2,7 +2,7 @@ package com.mogo.eagle.core.function.call.msgbox import com.mogo.eagle.core.data.msgbox.MsgBoxBean import com.mogo.eagle.core.data.msgbox.MsgCategory -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxListener +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxListener import com.mogo.eagle.core.function.call.base.CallerBase /** diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt index ba2b039546..0bcd26be6a 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/msgbox/CallerMsgBoxManager.kt @@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.call.msgbox import android.content.Context import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.msgbox.MsgBoxBean -import com.mogo.eagle.core.function.api.msgbox.IMsgBoxProvider +import com.mogo.eagle.core.function.api.datacenter.msgbox.IMsgBoxProvider import com.mogo.eagle.core.function.call.base.CallerBase object CallerMsgBoxManager { diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerLimitingVelocityListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerLimitingVelocityListenerManager.kt index a31d075db4..4c8811e2a1 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerLimitingVelocityListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerLimitingVelocityListenerManager.kt @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.call.v2x import com.mogo.eagle.core.data.enums.DataSourceType -import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener +import com.mogo.eagle.core.function.api.datacenter.union.ILimitingVelocityListener import com.mogo.eagle.core.function.call.base.CallerBase /** diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt index 60e4cd4e78..b463b1400c 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerTrafficLightListenerManager.kt @@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.call.v2x import com.mogo.eagle.core.data.enums.DataSourceType import com.mogo.eagle.core.data.enums.TrafficLightEnum import com.mogo.eagle.core.data.trafficlight.TrafficLightResult -import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener +import com.mogo.eagle.core.function.api.datacenter.union.IMoGoTrafficLightListener import com.mogo.eagle.core.function.call.base.CallerBase object CallerTrafficLightListenerManager : CallerBase() { From 18f3954545bb9efcea76e27c633f06e497a96635 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Fri, 17 Feb 2023 21:05:38 +0800 Subject: [PATCH 07/10] =?UTF-8?q?[Fix]=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E7=9A=84=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/map/OfflineMapDialog.kt | 7 ++----- .../hmi/ui/widget/SystemVersionView.kt | 11 +++++----- .../IMoGoCheckAutoPilotBtnListener.kt | 4 +++- .../api/hmi/warning/IMoGoWaringProvider.kt | 20 ------------------- .../call/hmi/CallerHmiListenerManager.kt | 8 +++++++- .../function/call/hmi/CallerHmiManager.kt | 4 ---- .../call/map/CallerMapUIServiceManager.kt | 5 ++--- gradle.properties | 2 +- .../java/com/mogo/map/AMapViewWrapper.java | 2 +- 9 files changed, 22 insertions(+), 41 deletions(-) delete mode 100644 core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt index aa62c470b2..0adbe08c49 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/map/OfflineMapDialog.kt @@ -6,12 +6,9 @@ import android.view.View import android.widget.ImageView import android.widget.ProgressBar import android.widget.TextView -import androidx.annotation.MainThread import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat -import androidx.core.content.res.ResourcesCompat -import androidx.core.view.marginTop -import com.mogo.eagle.core.function.call.hmi.CallerHmiManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.dialog.BaseFloatDialog @@ -107,7 +104,7 @@ class OfflineMapDialog(context: Context): BaseFloatDialog(context) { downloadPercentView?.text = "$progress%" if (progress == 100) { showNewContent(isLoading = false, true) - CallerHmiManager.updateHDDataCacheStatus(true) + CallerHmiListenerManager.invokeHDDataCacheStatus(true) } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt index 65f2050257..1ae6ab1b7d 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/SystemVersionView.kt @@ -10,12 +10,11 @@ import com.mogo.eagle.core.data.bindingcar.AdUpgradeStateHelper import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener import com.mogo.eagle.core.function.api.devatools.IMoGoDevaToolsListener -import com.mogo.eagle.core.function.api.bindingcar.IMoGoBindingCarListener +import com.mogo.eagle.core.function.api.hmi.autopilot.IMoGoCheckAutoPilotBtnListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager -import com.mogo.eagle.core.function.call.bindingcar.CallerBindingCarListenerManager -import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager +import com.mogo.eagle.core.function.call.hmi.CallerHmiListenerManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.ui.map.OfflineMapDialog @@ -38,7 +37,7 @@ class SystemVersionView @JvmOverloads constructor( attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : ConstraintLayout(context, attrs, defStyleAttr), IMoGoAutopilotStatusListener, - IMoGoDevaToolsListener { + IMoGoDevaToolsListener, IMoGoCheckAutoPilotBtnListener { companion object { const val TAG = "SystemVersionView" @@ -256,7 +255,7 @@ class SystemVersionView @JvmOverloads constructor( } - fun updateHDDataCacheStatus(isCached: Boolean) { + override fun updateHDDataCacheStatus(isCached: Boolean) { if (isCached) { ivHDCacheStatus?.setImageResource(R.drawable.icon_latest_version) } else { @@ -293,6 +292,7 @@ class SystemVersionView @JvmOverloads constructor( if (isInEditMode) { return } + CallerHmiListenerManager.addListener(TAG, this) CallerAutoPilotStatusListenerManager.addListener(TAG, this) CallerDevaToolsListenerManager.addListener(TAG,this) needQueryContainers = true @@ -303,6 +303,7 @@ class SystemVersionView @JvmOverloads constructor( if (isInEditMode) { return } + CallerHmiListenerManager.removeListener(TAG) CallerAutoPilotStatusListenerManager.removeListener(TAG) CallerDevaToolsListenerManager.removeListener(TAG) needQueryContainers = false diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/autopilot/IMoGoCheckAutoPilotBtnListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/autopilot/IMoGoCheckAutoPilotBtnListener.kt index cbfb84bd8a..ba1f2dfa8d 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/autopilot/IMoGoCheckAutoPilotBtnListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/autopilot/IMoGoCheckAutoPilotBtnListener.kt @@ -6,5 +6,7 @@ package com.mogo.eagle.core.function.api.hmi.autopilot * 自动驾驶控制按钮回调监听 */ interface IMoGoCheckAutoPilotBtnListener { - fun onCheck(isChecked: Boolean) + fun onCheck(isChecked: Boolean) {} + + fun updateHDDataCacheStatus(isCached: Boolean) {} } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt deleted file mode 100644 index 42b0cadcfc..0000000000 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt +++ /dev/null @@ -1,20 +0,0 @@ -package com.mogo.eagle.core.function.api.hmi.warning - -import android.view.View -import android.view.ViewGroup -import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo -import com.mogo.eagle.core.data.enums.WarningDirectionEnum -import com.mogo.eagle.core.data.map.Infrastructure -import com.mogo.eagle.core.data.notice.NoticeNormalData -import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData -import com.mogo.eagle.core.data.report.ReportEntity -import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy -import com.mogo.eagle.core.function.api.hmi.view.IOchBusView - -/** - * @author xiaoyuzhou - * @date 2021/8/2 7:36 下午 - */ -interface IMoGoWaringProvider : IMoGoHmiViewProxy { - fun updateHDDataCacheStatus(isCached: Boolean) -} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiListenerManager.kt index eae3b6cac2..d8cb8b533e 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiListenerManager.kt @@ -30,5 +30,11 @@ object CallerHmiListenerManager : CallerBase() { } } - + fun invokeHDDataCacheStatus(isCached: Boolean) { + M_LISTENERS.forEach { + val tag = it.key + val listener = it.value + listener.updateHDDataCacheStatus(isCached) + } + } } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index b6aca6f544..663a89c7bf 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -211,8 +211,4 @@ object CallerHmiManager { fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int) { hmiProviderApi?.updateStatusBarDownloadView(insert, tag, progress) } - - fun updateHDDataCacheStatus(isCached: Boolean) { - waringProviderApi?.updateHDDataCacheStatus(isCached) - } } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt index 0562c116ee..1c5104a623 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapUIServiceManager.kt @@ -6,8 +6,7 @@ import com.mogo.eagle.core.function.api.map.IMogoMapService import com.mogo.eagle.core.function.api.map.marker.IMogoMarkerService import com.mogo.eagle.core.function.call.base.CallerBase import com.mogo.map.hdcache.IHdCacheListener -import com.mogo.map.listener.IMogoHosListenerRegister -import com.mogo.map.location.IMogoLocationClient +import com.mogo.map.location.IMogoGDLocationClient import com.mogo.map.marker.IMogoMarkerManager import com.mogo.map.overlay.IMogoOverlayManager import com.mogo.map.uicontroller.IMogoMapUIController @@ -44,7 +43,7 @@ object CallerMapUIServiceManager { return serviceProvider?.overlayManager } - fun getGDLocationServer(context: Context):IMogoGDLocationClient?{ + fun getGDLocationServer(context: Context): IMogoGDLocationClient?{ return serviceProvider?.getGDLocationServer(context) } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 9578aa5a52..dd72d41281 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.4.2 MOGO_TELEMATIC_VERSION=1.4.4.2 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.10.0.2 +MAP_SDK_VERSION=2.10.0.2_test_01 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7 diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index e46408c5f2..68c15404f3 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -17,6 +17,7 @@ import android.content.Context; import android.graphics.Point; import android.graphics.Rect; import android.os.Bundle; +import android.os.Looper; import android.os.Trace; import android.text.TextUtils; import android.util.Log; @@ -44,7 +45,6 @@ import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.map.hdcache.IHdCacheListener; import com.mogo.map.listener.MogoMapListenerHandler; import com.mogo.map.location.GDLocationClient; -import com.mogo.map.navi.MogoCarLocationChangedListenerRegister; import com.mogo.map.uicontroller.CarCursorOption; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.map.uicontroller.IMogoMapUIController; From d5474743bf4a75be14b1e02dc87d9fee96479545 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 17 Feb 2023 21:31:27 +0800 Subject: [PATCH 08/10] [2.13.0-arch-opt] v2x remove --- .../presenter/BaseTaxiPassengerPresenter.java | 5 +- .../TaxiPassengerServingOrderPresenter.java | 2 + .../ui/TaxiPassengerBaseFragment.java | 2 - .../com/mogo/functions/test/RoadAITest.kt | 1 + .../mogo-core-function-biz/build.gradle | 11 ++- .../src/main/AndroidManifest.xml | 9 ++- .../eagle/function/biz/FuncBizProvider.kt | 15 ++++ .../function/biz/v2x/v2n}/V2XEventManager.kt | 26 +++--- .../function/biz/v2x/v2n}/V2XPoiLoader.kt | 10 +-- .../biz/v2x/v2n}/alarm/V2XAlarmServer.java | 2 +- .../function/biz/v2x/v2n}/bridge/BridgeApi.kt | 25 ++++-- .../v2x/v2n}/consts/MoGoV2XServicePaths.java | 2 +- .../biz/v2x/v2n}/consts/V2XConst.java | 2 +- .../IMoGoPersonWarnPolylineManager.java | 2 +- .../manager/IMoGoStopPolylineManager.java | 2 +- .../v2n}/manager/IMoGoV2XMarkerManager.java | 2 +- .../manager/IMoGoWarnPolylineManager.java | 2 +- .../impl/MoGoPersonWarnPolylineManager.java | 9 +-- .../manager/impl/MoGoStopPolylineManager.java | 9 +-- .../manager/impl/MoGoV2XMarkerManager.java | 10 +-- .../manager/impl/MoGoWarnPolylineManager.java | 7 +- .../biz/v2x/v2n}/marker/V2XMarkerAdapter.java | 4 +- .../biz/v2x/v2n/network}/V2XRefreshModel.kt | 14 +--- .../biz/v2x/v2n/network}/api/V2XApiService.kt | 2 +- .../v2x/v2n/network}/body/V2XRefreshEntity.kt | 2 +- .../v2x/v2n/network}/callback/IV2XCallback.kt | 2 +- .../network}/callback/IV2XRefreshCallback.kt | 2 +- .../v2n}/receiver/SceneBroadcastReceiver.kt | 6 +- .../v2x/v2n}/remove/MarkerRemoveManager.kt | 2 +- .../biz/v2x/v2n}/scenario/IV2XScenario.java | 2 +- .../v2n}/scenario/IV2XScenarioManager.java | 2 +- .../v2n}/scenario/impl/AbsV2XScenario.java | 6 +- .../scenario/impl/V2XScenarioManager.java | 12 +-- .../scenario/scene/airoad/AiRoadMarker.kt | 8 +- .../scene/road/V2XAiRoadEventMarker.kt | 9 +-- .../scene/road/V2XRoadEventMarker.java | 14 ++-- .../scene/road/V2XRoadEventScenario.java | 6 +- .../warning/V2XFrontWarningScenario.java | 6 +- .../scene/warning/V2XWarningMarker.java | 12 +-- .../v2x/v2n}/scenario/view/IV2XMarker.java | 2 +- .../function/biz/v2x/v2n}/test/TestConsts.kt | 2 +- .../biz/v2x/v2n}/test/TestOnLineCarUtils.java | 2 +- .../biz/v2x/v2n}/test/TestV2XReceiver.java | 4 +- .../biz/v2x/v2n}/utils/DistanceUtils.kt | 2 +- .../biz/v2x/v2n}/utils/EntityUtils.kt | 4 +- .../function/biz/v2x/v2n}/utils/MapUtils.kt | 2 +- .../v2x/v2n}/view/V2XMarkerRoadEventView.kt | 4 +- .../v_to_x_marker_1.png | Bin .../v_to_x_warning_car_red.png | Bin .../res/drawable-xhdpi/v_to_x_marker_1.png | Bin .../drawable-xhdpi/v_to_x_warning_car_red.png | Bin .../v_to_x_warning_circle_orange_00011.png | Bin .../v_to_x_warning_circle_orange_00012.png | Bin .../v_to_x_warning_circle_orange_00013.png | Bin .../v_to_x_warning_circle_orange_00014.png | Bin .../v_to_x_warning_circle_orange_00015.png | Bin .../v_to_x_warning_circle_orange_00016.png | Bin .../v_to_x_warning_circle_orange_00017.png | Bin .../v_to_x_warning_circle_orange_00018.png | Bin .../v_to_x_warning_circle_orange_00019.png | Bin .../v_to_x_warning_circle_orange_00020.png | Bin .../v_to_x_warning_circle_orange_00021.png | Bin .../v_to_x_warning_circle_orange_00022.png | Bin .../v_to_x_warning_circle_orange_00023.png | Bin .../v_to_x_warning_circle_orange_00024.png | Bin .../v_to_x_warning_circle_orange_00025.png | Bin .../v_to_x_warning_circle_orange_00026.png | Bin .../v_to_x_warning_circle_orange_00027.png | Bin .../v_to_x_warning_circle_orange_00028.png | Bin .../v_to_x_warning_circle_orange_00029.png | Bin .../v_to_x_warning_circle_orange_00030.png | Bin .../v_to_x_warning_circle_orange_00031.png | Bin .../v_to_x_warning_circle_orange_00032.png | Bin .../v_to_x_warning_circle_orange_00033.png | Bin .../v_to_x_warning_circle_orange_00034.png | Bin .../v_to_x_warning_circle_orange_00035.png | Bin .../v_to_x_warning_circle_orange_00036.png | Bin .../v_to_x_warning_circle_orange_00037.png | Bin .../v_to_x_warning_circle_orange_00038.png | Bin .../v_to_x_warning_circle_orange_00039.png | Bin .../v_to_x_warning_circle_orange_00040.png | Bin .../v_to_x_warning_circle_orange_00041.png | Bin .../v_to_x_warning_circle_orange_00042.png | Bin .../v_to_x_warning_circle_orange_00043.png | Bin .../v_to_x_warning_circle_orange_00044.png | Bin .../v_to_x_warning_circle_orange_00045.png | Bin .../v_to_x_warning_circle_orange_00046.png | Bin .../v_to_x_warning_circle_orange_00047.png | Bin .../v_to_x_warning_circle_orange_00048.png | Bin .../v_to_x_warning_circle_red_00011.png | Bin .../v_to_x_warning_circle_red_00012.png | Bin .../v_to_x_warning_circle_red_00013.png | Bin .../v_to_x_warning_circle_red_00014.png | Bin .../v_to_x_warning_circle_red_00015.png | Bin .../v_to_x_warning_circle_red_00016.png | Bin .../v_to_x_warning_circle_red_00017.png | Bin .../v_to_x_warning_circle_red_00018.png | Bin .../v_to_x_warning_circle_red_00019.png | Bin .../v_to_x_warning_circle_red_00020.png | Bin .../v_to_x_warning_circle_red_00021.png | Bin .../v_to_x_warning_circle_red_00022.png | Bin .../v_to_x_warning_circle_red_00023.png | Bin .../v_to_x_warning_circle_red_00024.png | Bin .../v_to_x_warning_circle_red_00025.png | Bin .../v_to_x_warning_circle_red_00026.png | Bin .../v_to_x_warning_circle_red_00027.png | Bin .../v_to_x_warning_circle_red_00028.png | Bin .../v_to_x_warning_circle_red_00029.png | Bin .../v_to_x_warning_circle_red_00030.png | Bin .../v_to_x_warning_circle_red_00031.png | Bin .../v_to_x_warning_circle_red_00032.png | Bin .../v_to_x_warning_circle_red_00033.png | Bin .../v_to_x_warning_circle_red_00034.png | Bin .../v_to_x_warning_circle_red_00035.png | Bin .../v_to_x_warning_circle_red_00036.png | Bin .../v_to_x_warning_circle_red_00037.png | Bin .../v_to_x_warning_circle_red_00038.png | Bin .../v_to_x_warning_circle_red_00039.png | Bin .../v_to_x_warning_circle_red_00040.png | Bin .../v_to_x_warning_circle_red_00041.png | Bin .../v_to_x_warning_circle_red_00042.png | Bin .../v_to_x_warning_circle_red_00043.png | Bin .../v_to_x_warning_circle_red_00044.png | Bin .../v_to_x_warning_circle_red_00045.png | Bin .../v_to_x_warning_circle_red_00046.png | Bin .../v_to_x_warning_circle_red_00047.png | Bin .../v_to_x_warning_circle_red_00048.png | Bin .../main/res/layout/view_marker_event_car.xml | 0 .../res/layout/view_marker_event_road.xml | 0 .../res/raw/scenario_road_event_data.json | 0 .../raw/scenario_warning_event_data_left.json | 0 ...enario_warning_event_data_pedestrians.json | 0 .../scenario_warning_event_data_right.json | 0 .../src/main/res/raw/test_coordinates.json | 0 .../res/raw/test_data_v2x_zuiyouluxian.json | 0 .../function/main/MainMoGoApplication.java | 2 - .../mogo-core-function-v2x/build.gradle | 4 +- .../src/main/AndroidManifest.xml | 7 +- .../eagle/core/function/v2x/V2XProvider.kt | 36 --------- .../core/data/constants/MogoServicePaths.java | 6 -- .../function/api/biz/IMoGoFuncBizProvider.kt | 4 + .../function/api/v2x/IV2XEventProvider.kt | 7 -- .../function/call/map/CallerSmpManager.kt | 75 ------------------ 143 files changed, 160 insertions(+), 269 deletions(-) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/V2XEventManager.kt (94%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/V2XPoiLoader.kt (94%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/alarm/V2XAlarmServer.java (99%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/bridge/BridgeApi.kt (58%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/consts/MoGoV2XServicePaths.java (94%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/consts/V2XConst.java (89%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/manager/IMoGoPersonWarnPolylineManager.java (91%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/manager/IMoGoStopPolylineManager.java (91%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/manager/IMoGoV2XMarkerManager.java (95%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/manager/IMoGoWarnPolylineManager.java (91%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/manager/impl/MoGoPersonWarnPolylineManager.java (88%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/manager/impl/MoGoStopPolylineManager.java (89%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/manager/impl/MoGoV2XMarkerManager.java (95%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/manager/impl/MoGoWarnPolylineManager.java (92%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/marker/V2XMarkerAdapter.java (98%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network}/V2XRefreshModel.kt (88%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network}/api/V2XApiService.kt (91%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network}/body/V2XRefreshEntity.kt (93%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network}/callback/IV2XCallback.kt (92%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network}/callback/IV2XRefreshCallback.kt (67%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/receiver/SceneBroadcastReceiver.kt (85%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/remove/MarkerRemoveManager.kt (99%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/IV2XScenario.java (92%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/IV2XScenarioManager.java (84%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/impl/AbsV2XScenario.java (88%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/impl/V2XScenarioManager.java (89%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/scene/airoad/AiRoadMarker.kt (96%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/scene/road/V2XAiRoadEventMarker.kt (88%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/scene/road/V2XRoadEventMarker.java (87%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/scene/road/V2XRoadEventScenario.java (97%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/scene/warning/V2XFrontWarningScenario.java (96%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/scene/warning/V2XWarningMarker.java (98%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/scenario/view/IV2XMarker.java (77%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/test/TestConsts.kt (79%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/test/TestOnLineCarUtils.java (99%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/test/TestV2XReceiver.java (97%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/utils/DistanceUtils.kt (96%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/utils/EntityUtils.kt (96%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/utils/MapUtils.kt (96%) rename core/function-impl/{mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events => mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n}/view/V2XMarkerRoadEventView.kt (95%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_marker_1.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00011.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00012.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00013.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00014.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00015.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00016.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00017.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00018.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00019.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00020.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00021.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00022.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00023.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00024.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00025.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00026.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00027.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00028.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00029.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00030.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00031.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00032.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00033.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00034.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00035.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00036.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00037.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00038.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00039.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00040.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00041.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00042.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00043.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00044.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00045.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00046.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00047.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00048.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00011.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00012.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00013.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00014.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00015.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00016.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00017.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00018.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00019.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00020.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00021.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00022.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00023.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00024.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00025.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00026.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00027.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00028.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00029.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00030.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00031.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00032.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00033.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00034.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00035.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00036.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00037.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00038.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00039.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00040.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00041.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00042.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00043.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00044.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00045.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00046.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00047.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00048.png (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/layout/view_marker_event_car.xml (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/layout/view_marker_event_road.xml (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/raw/scenario_road_event_data.json (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/raw/scenario_warning_event_data_left.json (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/raw/scenario_warning_event_data_pedestrians.json (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/raw/scenario_warning_event_data_right.json (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/raw/test_coordinates.json (100%) rename core/function-impl/{mogo-core-function-v2x => mogo-core-function-biz}/src/main/res/raw/test_data_v2x_zuiyouluxian.json (100%) delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt delete mode 100644 core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IV2XEventProvider.kt delete mode 100644 core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java index 0173533e1e..d74028ff9d 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java @@ -2,7 +2,6 @@ package com.mogo.och.taxi.passenger.presenter; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI_P; -import android.location.Location; import android.os.Looper; import androidx.annotation.NonNull; @@ -12,7 +11,6 @@ import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.mvp.Presenter; import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; -import com.mogo.eagle.core.function.call.map.CallerSmpManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; import com.mogo.och.common.module.manager.OCHAdasAbilityManager; @@ -236,7 +234,8 @@ public class BaseTaxiPassengerPresenter extends Presenter - + + + + + + + + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt index c820952fa3..d4b9bc0d22 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt @@ -17,6 +17,8 @@ import com.mogo.eagle.function.biz.v2x.overview.OverViewDataManager import com.mogo.eagle.function.biz.v2x.overview.db.OverviewDb import com.mogo.eagle.function.biz.v2x.road.LineUploadManager import com.mogo.eagle.function.biz.v2x.trafficlight.core.MogoTrafficLightManager +import com.mogo.eagle.function.biz.v2x.v2n.V2XEventManager +import com.mogo.eagle.function.biz.v2x.v2n.V2XPoiLoader.Companion.v2xPoiLoader import com.mogo.eagle.function.biz.v2x.vip.VipCarManager @Route(path = MogoServicePaths.PATH_FUNC_BIZ) @@ -35,6 +37,10 @@ class FuncBizProvider : IMoGoFuncBizProvider { OverviewDb.getDb(context) MogoTrafficLightManager.INSTANCE.initServer(context) VipCarManager.INSTANCE.initServer(context) + if(!(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) + && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode))){ + V2XEventManager.init(context) + } if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ LineUploadManager.getInstance(context)?.init() } @@ -84,12 +90,21 @@ class FuncBizProvider : IMoGoFuncBizProvider { OverViewDataManager.getAllV2XEventsByLineId(MoGoAiCloudClientConfig.getInstance().sn) } + override fun queryV2XEvents() { + v2xPoiLoader.queryWholeRoadEvents() + } + override fun onDestroy() { noticeSocketManager.release() dispatchAutoPilotManager.release() cronTaskManager.release() VipCarManager.INSTANCE.destroy() + + if(!(AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) + && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode))){ + V2XEventManager.onDestroy() + } if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){ mContext?.let { LineUploadManager.getInstance(it)?.onDestroy() diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt similarity index 94% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt index b1123c6860..32fd455865 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XEventManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events +package com.mogo.eagle.function.biz.v2x.v2n import android.annotation.SuppressLint import android.content.Context @@ -33,25 +33,25 @@ import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager -import com.mogo.eagle.core.function.v2x.events.alarm.V2XAlarmServer -import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi -import com.mogo.eagle.core.function.v2x.events.consts.V2XConst.BROADCAST_SCENE_EXTRA_KEY -import com.mogo.eagle.core.function.v2x.events.consts.V2XConst.BROADCAST_SCENE_HANDLER_ACTION -import com.mogo.eagle.core.function.v2x.events.receiver.SceneBroadcastReceiver -import com.mogo.eagle.core.function.v2x.events.scenario.impl.V2XScenarioManager -import com.mogo.eagle.core.function.v2x.events.utils.toRoadMarker -import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback +import com.mogo.eagle.function.biz.v2x.v2n.alarm.V2XAlarmServer +import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi +import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst.BROADCAST_SCENE_EXTRA_KEY +import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst.BROADCAST_SCENE_HANDLER_ACTION +import com.mogo.eagle.function.biz.v2x.v2n.receiver.SceneBroadcastReceiver +import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.V2XScenarioManager +import com.mogo.eagle.function.biz.v2x.v2n.utils.toRoadMarker import com.mogo.eagle.core.data.v2x.V2XEvent import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult import com.mogo.eagle.core.data.v2x.V2XWarningTarget import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager -import com.mogo.eagle.core.function.v2x.events.V2XPoiLoader.Companion.v2xPoiLoader -import com.mogo.eagle.core.function.v2x.events.utils.toV2XRoadEventEntity +import com.mogo.eagle.function.biz.v2x.v2n.V2XPoiLoader.Companion.v2xPoiLoader import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X import com.mogo.eagle.core.utilcode.util.Utils +import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XCallback +import com.mogo.eagle.function.biz.v2x.v2n.utils.toV2XRoadEventEntity import com.zhjt.service.chain.ChainLog import com.zhjt.service.chain.TracingConstants import kotlinx.coroutines.CoroutineScope @@ -378,10 +378,6 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback, } } - fun queryWholeRoadEvents() { - v2xPoiLoader.queryWholeRoadEvents() - } - override fun onFail(msg: String) { CallerLogger.e("$M_V2X$TAG", "Error: $msg") } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XPoiLoader.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt similarity index 94% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XPoiLoader.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt index 065dd53827..9fa780cba4 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/V2XPoiLoader.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XPoiLoader.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events +package com.mogo.eagle.function.biz.v2x.v2n import android.os.Handler import android.os.Looper @@ -11,13 +11,13 @@ import com.mogo.eagle.core.data.v2x.V2XEvent import com.mogo.eagle.core.data.v2x.V2XMarkerResponse import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager -import com.mogo.eagle.core.function.v2x.internal.callback.IV2XCallback -import com.mogo.eagle.core.function.v2x.internal.http.V2XRefreshModel -import com.mogo.eagle.core.function.v2x.internal.http.callback.IV2XRefreshCallback -import com.mogo.eagle.core.function.v2x.internal.utils.DistanceUtils import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.eagle.function.biz.v2x.v2n.network.V2XRefreshModel +import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XCallback +import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XRefreshCallback +import com.mogo.eagle.function.biz.v2x.v2n.utils.DistanceUtils import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/alarm/V2XAlarmServer.java similarity index 99% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/alarm/V2XAlarmServer.java index 0156f41948..8c3b605103 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/alarm/V2XAlarmServer.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/alarm/V2XAlarmServer.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.alarm; +package com.mogo.eagle.function.biz.v2x.v2n.alarm; import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.MogoLocation; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/bridge/BridgeApi.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/bridge/BridgeApi.kt similarity index 58% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/bridge/BridgeApi.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/bridge/BridgeApi.kt index 8a9b602209..366a3c55ef 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/bridge/BridgeApi.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/bridge/BridgeApi.kt @@ -1,11 +1,14 @@ -package com.mogo.eagle.core.function.v2x.events.bridge +package com.mogo.eagle.function.biz.v2x.v2n.bridge import android.content.Context import com.alibaba.android.arouter.launcher.ARouter import com.mogo.eagle.core.data.map.MogoLocation -import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths -import com.mogo.eagle.core.function.v2x.events.manager.* +import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths import com.mogo.eagle.core.utilcode.util.Utils +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoV2XMarkerManager +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager import java.lang.ref.WeakReference import java.util.concurrent.atomic.AtomicReference @@ -24,22 +27,28 @@ internal object BridgeApi { } private val v2xWarnPolyline by lazy { - ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_WARN_POLYLINE_MANAGER).navigation(context()) as? IMoGoWarnPolylineManager + ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_WARN_POLYLINE_MANAGER).navigation( + context() + ) as? IMoGoWarnPolylineManager } private val v2xPersonWarnPolyline by lazy { - ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_PERSON_WARN_POLYLINE_MANAGER).navigation(context()) as? IMoGoPersonWarnPolylineManager + ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_PERSON_WARN_POLYLINE_MANAGER).navigation( + context() + ) as? IMoGoPersonWarnPolylineManager } private val v2xStopPolyline by lazy { - ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STOP_POLYLINE_MANAGER).navigation(context()) as? IMoGoStopPolylineManager + ARouter.getInstance().build(MoGoV2XServicePaths.PATH_V2X_STOP_POLYLINE_MANAGER).navigation( + context() + ) as? IMoGoStopPolylineManager } fun init(context: Context) { - this.context.set(WeakReference(context)) + BridgeApi.context.set(WeakReference(context)) } - fun context(): Context = this.context.get()?.get() ?: Utils.getApp() + fun context(): Context = context.get()?.get() ?: Utils.getApp() fun v2xMarker() = v2xMarker diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/consts/MoGoV2XServicePaths.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/MoGoV2XServicePaths.java similarity index 94% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/consts/MoGoV2XServicePaths.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/MoGoV2XServicePaths.java index cccd481291..4e4e959694 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/consts/MoGoV2XServicePaths.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/MoGoV2XServicePaths.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.consts; +package com.mogo.eagle.function.biz.v2x.v2n.consts; import androidx.annotation.Keep; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/consts/V2XConst.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/V2XConst.java similarity index 89% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/consts/V2XConst.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/V2XConst.java index b6dee1cb0f..c2f4fd35d5 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/consts/V2XConst.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/consts/V2XConst.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.consts; +package com.mogo.eagle.function.biz.v2x.v2n.consts; /** * author : donghongyu diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoPersonWarnPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoPersonWarnPolylineManager.java similarity index 91% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoPersonWarnPolylineManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoPersonWarnPolylineManager.java index d15a9c589d..81ff12f98f 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoPersonWarnPolylineManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoPersonWarnPolylineManager.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.manager; +package com.mogo.eagle.function.biz.v2x.v2n.manager; import android.content.Context; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoStopPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoStopPolylineManager.java similarity index 91% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoStopPolylineManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoStopPolylineManager.java index e0cca0ed76..2df7a2d0fd 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoStopPolylineManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoStopPolylineManager.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.manager; +package com.mogo.eagle.function.biz.v2x.v2n.manager; import android.content.Context; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoV2XMarkerManager.java similarity index 95% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoV2XMarkerManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoV2XMarkerManager.java index ed87273009..4118457e0c 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoV2XMarkerManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoV2XMarkerManager.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.manager; +package com.mogo.eagle.function.biz.v2x.v2n.manager; import android.content.Context; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoWarnPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoWarnPolylineManager.java similarity index 91% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoWarnPolylineManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoWarnPolylineManager.java index a79527e857..b888d21d03 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/IMoGoWarnPolylineManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/IMoGoWarnPolylineManager.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.manager; +package com.mogo.eagle.function.biz.v2x.v2n.manager; import android.content.Context; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoPersonWarnPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoPersonWarnPolylineManager.java similarity index 88% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoPersonWarnPolylineManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoPersonWarnPolylineManager.java index 3f73403da5..e1da74057e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoPersonWarnPolylineManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoPersonWarnPolylineManager.java @@ -1,18 +1,17 @@ -package com.mogo.eagle.core.function.v2x.events.manager.impl; +package com.mogo.eagle.function.biz.v2x.v2n.manager.impl; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths; -import com.mogo.eagle.core.function.v2x.events.consts.V2XConst; +import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths; +import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst; import com.mogo.eagle.core.data.v2x.DrawLineInfo; -import com.mogo.eagle.core.function.v2x.events.manager.IMoGoPersonWarnPolylineManager; +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager; import com.mogo.map.overlay.IMogoOverlayManager; import com.mogo.map.overlay.IMogoPolyline; import com.mogo.map.overlay.MogoPolylineOptions; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoStopPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoStopPolylineManager.java similarity index 89% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoStopPolylineManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoStopPolylineManager.java index 287be0c2c7..806688aabf 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoStopPolylineManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoStopPolylineManager.java @@ -1,18 +1,17 @@ -package com.mogo.eagle.core.function.v2x.events.manager.impl; +package com.mogo.eagle.function.biz.v2x.v2n.manager.impl; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths; -import com.mogo.eagle.core.function.v2x.events.consts.V2XConst; +import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths; +import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst; import com.mogo.eagle.core.data.v2x.DrawLineInfo; -import com.mogo.eagle.core.function.v2x.events.manager.IMoGoStopPolylineManager; +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager; import com.mogo.map.overlay.IMogoOverlayManager; import com.mogo.map.overlay.IMogoPolyline; import com.mogo.map.overlay.MogoPolylineOptions; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java similarity index 95% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java index 932164de80..b8d394e893 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoV2XMarkerManager.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.manager.impl; +package com.mogo.eagle.function.biz.v2x.v2n.manager.impl; import static com.mogo.commons.module.ServiceConst.CARD_TYPE_NOVELTY; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; @@ -16,10 +16,10 @@ import com.mogo.eagle.core.data.map.entity.MarkerShowEntity; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths; -import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XMarkerManager; -import com.mogo.eagle.core.function.v2x.events.marker.V2XMarkerAdapter; -import com.mogo.eagle.core.function.v2x.events.utils.MapUtils; +import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths; +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoV2XMarkerManager; +import com.mogo.eagle.function.biz.v2x.v2n.marker.V2XMarkerAdapter; +import com.mogo.eagle.function.biz.v2x.v2n.utils.MapUtils; import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.map.marker.IMogoMarker; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoWarnPolylineManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoWarnPolylineManager.java similarity index 92% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoWarnPolylineManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoWarnPolylineManager.java index a5ed5eda32..b0ae820d1f 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoWarnPolylineManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/manager/impl/MoGoWarnPolylineManager.java @@ -1,17 +1,16 @@ -package com.mogo.eagle.core.function.v2x.events.manager.impl; +package com.mogo.eagle.function.biz.v2x.v2n.manager.impl; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; import android.content.Context; import com.alibaba.android.arouter.facade.annotation.Route; -import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths; +import com.mogo.eagle.function.biz.v2x.v2n.consts.MoGoV2XServicePaths; import com.mogo.eagle.core.data.v2x.DrawLineInfo; -import com.mogo.eagle.core.function.v2x.events.manager.IMoGoWarnPolylineManager; +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager; import com.mogo.map.overlay.IMogoOverlayManager; import com.mogo.map.overlay.IMogoPolyline; import com.mogo.map.overlay.MogoPolylineOptions; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerAdapter.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java similarity index 98% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerAdapter.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java index 12a6e872f0..4038b75603 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/marker/V2XMarkerAdapter.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java @@ -1,11 +1,11 @@ -package com.mogo.eagle.core.function.v2x.events.marker; +package com.mogo.eagle.function.biz.v2x.v2n.marker; import android.content.Context; import android.graphics.Bitmap; import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; import com.mogo.eagle.core.function.v2x.R; -import com.mogo.eagle.core.function.v2x.events.view.V2XMarkerRoadEventView; +import com.mogo.eagle.function.biz.v2x.v2n.view.V2XMarkerRoadEventView; import java.util.ArrayList; /** diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/V2XRefreshModel.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/V2XRefreshModel.kt similarity index 88% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/V2XRefreshModel.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/V2XRefreshModel.kt index d24d8004c9..cbf3207f39 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/V2XRefreshModel.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/V2XRefreshModel.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.http +package com.mogo.eagle.function.biz.v2x.v2n.network import com.elegant.network.utils.GsonUtil import com.elegant.network.utils.SignUtil @@ -8,18 +8,12 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig import com.mogo.commons.AbsMogoApplication import com.mogo.commons.constants.HostConst import com.mogo.commons.network.ParamsUtil -import com.mogo.eagle.core.data.enums.DataSourceType -import com.mogo.eagle.core.data.msgbox.MsgBoxBean -import com.mogo.eagle.core.data.msgbox.MsgBoxType -import com.mogo.eagle.core.data.msgbox.V2XMsg import com.mogo.eagle.core.data.v2x.V2XEventData import com.mogo.eagle.core.data.v2x.V2XLocation import com.mogo.eagle.core.data.v2x.V2XMarkerResponse -import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager -import com.mogo.eagle.core.function.v2x.events.V2XPoiLoader -import com.mogo.eagle.core.function.v2x.internal.http.api.V2XApiService -import com.mogo.eagle.core.function.v2x.internal.http.body.V2XRefreshEntity -import com.mogo.eagle.core.function.v2x.internal.http.callback.IV2XRefreshCallback +import com.mogo.eagle.function.biz.v2x.v2n.network.api.V2XApiService +import com.mogo.eagle.function.biz.v2x.v2n.network.body.V2XRefreshEntity +import com.mogo.eagle.function.biz.v2x.v2n.network.callback.IV2XRefreshCallback import com.mogo.eagle.core.network.MoGoRetrofitFactory import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/api/V2XApiService.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/api/V2XApiService.kt similarity index 91% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/api/V2XApiService.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/api/V2XApiService.kt index 2ebb219093..2730863ae3 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/api/V2XApiService.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/api/V2XApiService.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.http.api +package com.mogo.eagle.function.biz.v2x.v2n.network.api import com.mogo.eagle.core.data.v2x.V2XEventResult import com.mogo.eagle.core.data.v2x.V2XMarkerResponse diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/body/V2XRefreshEntity.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/body/V2XRefreshEntity.kt similarity index 93% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/body/V2XRefreshEntity.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/body/V2XRefreshEntity.kt index d99ce1dac4..fead17f6fb 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/body/V2XRefreshEntity.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/body/V2XRefreshEntity.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.http.body +package com.mogo.eagle.function.biz.v2x.v2n.network.body import androidx.annotation.Keep import com.mogo.eagle.core.data.v2x.V2XLocation diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/callback/IV2XCallback.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/callback/IV2XCallback.kt similarity index 92% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/callback/IV2XCallback.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/callback/IV2XCallback.kt index 4a4d0e2b78..e4778e5baf 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/callback/IV2XCallback.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/callback/IV2XCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.callback +package com.mogo.eagle.function.biz.v2x.v2n.network.callback import com.mogo.eagle.core.data.v2x.V2XEvent diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/callback/IV2XRefreshCallback.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/callback/IV2XRefreshCallback.kt similarity index 67% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/callback/IV2XRefreshCallback.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/callback/IV2XRefreshCallback.kt index 3fb17ffef7..2dd97cb6be 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/http/callback/IV2XRefreshCallback.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/network/callback/IV2XRefreshCallback.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.http.callback +package com.mogo.eagle.function.biz.v2x.v2n.network.callback /** * 刷新回调 diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/SceneBroadcastReceiver.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/receiver/SceneBroadcastReceiver.kt similarity index 85% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/SceneBroadcastReceiver.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/receiver/SceneBroadcastReceiver.kt index 44a19d8500..1d07fc9312 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/receiver/SceneBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/receiver/SceneBroadcastReceiver.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.receiver +package com.mogo.eagle.function.biz.v2x.v2n.receiver import android.content.BroadcastReceiver import android.content.Context @@ -6,8 +6,8 @@ import android.content.Intent import android.content.IntentFilter import androidx.localbroadcastmanager.content.LocalBroadcastManager import com.mogo.eagle.core.data.map.entity.V2XMessageEntity -import com.mogo.eagle.core.function.v2x.events.consts.V2XConst -import com.mogo.eagle.core.function.v2x.events.scenario.impl.V2XScenarioManager +import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst +import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.V2XScenarioManager class SceneBroadcastReceiver : BroadcastReceiver() { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/remove/MarkerRemoveManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt similarity index 99% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/remove/MarkerRemoveManager.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt index 5afb5fc401..cc40d5d4ff 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/remove/MarkerRemoveManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/remove/MarkerRemoveManager.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.remove +package com.mogo.eagle.function.biz.v2x.v2n.remove import android.os.Handler import android.os.HandlerThread diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/IV2XScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/IV2XScenario.java similarity index 92% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/IV2XScenario.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/IV2XScenario.java index 40ef63740f..99ed07daf8 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/IV2XScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/IV2XScenario.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.scenario; +package com.mogo.eagle.function.biz.v2x.v2n.scenario; import com.mogo.eagle.core.data.map.entity.V2XMessageEntity; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/IV2XScenarioManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/IV2XScenarioManager.java similarity index 84% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/IV2XScenarioManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/IV2XScenarioManager.java index 7e055dcca3..13e03f1f10 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/IV2XScenarioManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/IV2XScenarioManager.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.scenario; +package com.mogo.eagle.function.biz.v2x.v2n.scenario; import com.mogo.eagle.core.data.map.entity.V2XMessageEntity; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/AbsV2XScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/AbsV2XScenario.java similarity index 88% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/AbsV2XScenario.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/AbsV2XScenario.java index 88baed92e0..6708c38ef9 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/AbsV2XScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/AbsV2XScenario.java @@ -1,11 +1,11 @@ -package com.mogo.eagle.core.function.v2x.events.scenario.impl; +package com.mogo.eagle.function.biz.v2x.v2n.scenario.impl; import androidx.annotation.Nullable; import com.mogo.eagle.core.data.map.entity.V2XMessageEntity; -import com.mogo.eagle.core.function.v2x.events.scenario.IV2XScenario; -import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.IV2XScenario; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker; import java.util.concurrent.atomic.AtomicReference; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java similarity index 89% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java index d9d77b72df..20061490ec 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/impl/V2XScenarioManager.java @@ -1,22 +1,18 @@ -package com.mogo.eagle.core.function.v2x.events.scenario.impl; +package com.mogo.eagle.function.biz.v2x.v2n.scenario.impl; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; -import android.content.Intent; - import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.mogo.commons.module.status.MogoStatusManager; import com.mogo.eagle.core.data.config.HmiBuildConfig; import com.mogo.eagle.core.data.map.entity.V2XMessageEntity; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.function.v2x.events.consts.V2XConst; -import com.mogo.eagle.core.function.v2x.events.scenario.IV2XScenarioManager; -import com.mogo.eagle.core.function.v2x.events.scenario.scene.road.V2XRoadEventScenario; -import com.mogo.eagle.core.function.v2x.events.scenario.scene.warning.V2XFrontWarningScenario; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.IV2XScenarioManager; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road.V2XRoadEventScenario; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.warning.V2XFrontWarningScenario; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ThreadUtils; -import com.mogo.eagle.core.utilcode.util.Utils; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.map.uicontroller.VisualAngleMode; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt similarity index 96% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt index c088868c50..91f0bbbf7a 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/airoad/AiRoadMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad +package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad import android.animation.ArgbEvaluator import android.graphics.Color @@ -11,7 +11,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity import com.mogo.eagle.core.function.call.autopilot.* import com.mogo.eagle.core.function.call.map.* -import com.mogo.eagle.core.function.v2x.events.scenario.scene.road.V2XAiRoadEventMarker +import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road.V2XAiRoadEventMarker import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.DrivingDirectionUtils import com.mogo.map.MogoMap @@ -20,8 +20,8 @@ import com.mogo.map.overlay.MogoPolylineOptions import java.util.* import java.util.concurrent.atomic.AtomicReference import java.util.concurrent.ConcurrentHashMap -import com.mogo.eagle.core.function.v2x.events.remove.MarkerRemoveManager -import com.mogo.eagle.core.function.v2x.events.remove.MarkerWrapper +import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerRemoveManager +import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper /** * Ai云道路施工事件，道路颜色标记类 diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt similarity index 88% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt index 2a1ee214bd..6ffc579935 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XAiRoadEventMarker.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XAiRoadEventMarker.kt @@ -1,14 +1,13 @@ -package com.mogo.eagle.core.function.v2x.events.scenario.scene.road +package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road import android.graphics.Color import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.map.MogoLatLng -import com.mogo.eagle.core.data.map.MogoLocation import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager -import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi.context -import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi.v2xMarker -import com.mogo.eagle.core.function.v2x.events.remove.MarkerWrapper +import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi.context +import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi.v2xMarker +import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper import com.mogo.map.marker.IMogoMarker import com.mogo.map.overlay.IMogoPolyline import com.mogo.map.overlay.MogoPolylineOptions diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java similarity index 87% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java index b97689f35b..992c0c3c33 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventMarker.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventMarker.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.scenario.scene.road; +package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road; import android.util.Log; import androidx.core.util.Pair; @@ -6,12 +6,12 @@ import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.entity.MarkerExploreWay; import com.mogo.eagle.core.data.map.entity.MarkerLocation; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; -import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi; -import com.mogo.eagle.core.function.v2x.events.manager.IMoGoV2XMarkerManager; -import com.mogo.eagle.core.function.v2x.events.remove.MarkerWrapper; -import com.mogo.eagle.core.function.v2x.events.remove.MarkerRemoveManager; -import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.AiRoadMarker; -import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; +import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi; +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoV2XMarkerManager; +import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerWrapper; +import com.mogo.eagle.function.biz.v2x.v2n.remove.MarkerRemoveManager; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad.AiRoadMarker; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker; import com.mogo.map.marker.IMogoMarker; import java.util.ArrayList; import java.util.List; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java similarity index 97% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java index c604e02cc3..27f28c1e21 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/road/V2XRoadEventScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/road/V2XRoadEventScenario.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.scenario.scene.road; +package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.road; import com.mogo.commons.AbsMogoApplication; import com.mogo.eagle.core.data.enums.EventTypeEnumNew; @@ -17,8 +17,8 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.map.CallerVisualAngleManager; import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager; -import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario; -import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.AbsV2XScenario; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker; import com.mogo.eagle.core.network.utils.GsonUtil; import com.mogo.eagle.core.utilcode.mogo.logger.Logger; import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java similarity index 96% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java index 9350454df4..18573dfa04 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XFrontWarningScenario.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XFrontWarningScenario.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.scenario.scene.warning; +package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.warning; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X; @@ -21,8 +21,8 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener; import com.mogo.eagle.core.function.call.hmi.CallerHmiManager; import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager; -import com.mogo.eagle.core.function.v2x.events.scenario.impl.AbsV2XScenario; -import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.impl.AbsV2XScenario; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker; import com.mogo.eagle.core.data.v2x.V2XWarningTarget; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java similarity index 98% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java index c0ca15c5cb..8ad6643354 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/scene/warning/V2XWarningMarker.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/warning/V2XWarningMarker.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.scenario.scene.warning; +package com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.warning; import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_STOP_LINE_DATA; import static com.mogo.eagle.core.data.constants.DataTypes.TYPE_MARKER_CLOUD_WARN_DATA; @@ -13,11 +13,11 @@ import com.mogo.eagle.core.data.map.MogoLocation; import com.mogo.eagle.core.data.v2x.DrawLineInfo; import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager; import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager; -import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi; -import com.mogo.eagle.core.function.v2x.events.manager.IMoGoPersonWarnPolylineManager; -import com.mogo.eagle.core.function.v2x.events.manager.IMoGoStopPolylineManager; -import com.mogo.eagle.core.function.v2x.events.manager.IMoGoWarnPolylineManager; -import com.mogo.eagle.core.function.v2x.events.scenario.view.IV2XMarker; +import com.mogo.eagle.function.biz.v2x.v2n.bridge.BridgeApi; +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoPersonWarnPolylineManager; +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoStopPolylineManager; +import com.mogo.eagle.function.biz.v2x.v2n.manager.IMoGoWarnPolylineManager; +import com.mogo.eagle.function.biz.v2x.v2n.scenario.view.IV2XMarker; import com.mogo.eagle.core.data.v2x.V2XLocation; import com.mogo.eagle.core.data.v2x.V2XWarningTarget; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/view/IV2XMarker.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/view/IV2XMarker.java similarity index 77% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/view/IV2XMarker.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/view/IV2XMarker.java index 8dcf008880..7a88880088 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/view/IV2XMarker.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/view/IV2XMarker.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.scenario.view; +package com.mogo.eagle.function.biz.v2x.v2n.scenario.view; /** * author : donghongyu diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestConsts.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestConsts.kt similarity index 79% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestConsts.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestConsts.kt index 98e85df379..4aa9ccd60f 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestConsts.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestConsts.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.test +package com.mogo.eagle.function.biz.v2x.v2n.test class TestConsts { diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestOnLineCarUtils.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestOnLineCarUtils.java similarity index 99% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestOnLineCarUtils.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestOnLineCarUtils.java index 08a55061f4..8a0c63380c 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestOnLineCarUtils.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestOnLineCarUtils.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.test; +package com.mogo.eagle.function.biz.v2x.v2n.test; import static com.mogo.eagle.core.data.map.entity.V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestV2XReceiver.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestV2XReceiver.java similarity index 97% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestV2XReceiver.java rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestV2XReceiver.java index acd5440e71..12ece21973 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/test/TestV2XReceiver.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestV2XReceiver.java @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.test; +package com.mogo.eagle.function.biz.v2x.v2n.test; import android.content.BroadcastReceiver; import android.content.Context; @@ -10,7 +10,7 @@ import com.mogo.eagle.core.data.map.MogoLatLng; import com.mogo.eagle.core.data.map.entity.V2XMessageEntity; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; import com.mogo.eagle.core.data.v2x.V2XOptimalRouteDataRes; -import com.mogo.eagle.core.function.v2x.events.consts.V2XConst; +import com.mogo.eagle.function.biz.v2x.v2n.consts.V2XConst; import java.util.List; diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/utils/DistanceUtils.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/DistanceUtils.kt similarity index 96% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/utils/DistanceUtils.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/DistanceUtils.kt index 43f59ca92c..89538c294e 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/internal/utils/DistanceUtils.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/DistanceUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.internal.utils +package com.mogo.eagle.function.biz.v2x.v2n.utils import kotlin.math.asin import kotlin.math.cos diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/EntityUtils.kt similarity index 96% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/EntityUtils.kt index 69c1369b52..89b9608339 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/EntityUtils.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/EntityUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.utils +package com.mogo.eagle.function.biz.v2x.v2n.utils import androidx.core.util.Pair import com.mogo.eagle.core.data.enums.EventTypeEnumNew.Companion.isRoadEvent @@ -7,7 +7,7 @@ import com.mogo.eagle.core.data.map.entity.MarkerLocation import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity import com.mogo.eagle.core.data.v2x.V2XMarkerCardResult import com.mogo.eagle.core.data.v2x.V2XRoadXData -import com.mogo.eagle.core.function.v2x.events.scenario.scene.airoad.AiRoadMarker +import com.mogo.eagle.function.biz.v2x.v2n.scenario.scene.airoad.AiRoadMarker import com.mogo.eagle.core.utilcode.util.CoordinateTransform import mogo.telematics.pad.MessagePad import roadwork.Road diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/MapUtils.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/MapUtils.kt similarity index 96% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/MapUtils.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/MapUtils.kt index c49b645366..3615906cb1 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/utils/MapUtils.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/utils/MapUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.utils +package com.mogo.eagle.function.biz.v2x.v2n.utils import android.content.Context import android.graphics.Rect diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XMarkerRoadEventView.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/view/V2XMarkerRoadEventView.kt similarity index 95% rename from core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XMarkerRoadEventView.kt rename to core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/view/V2XMarkerRoadEventView.kt index c9d1589194..dc1640cb25 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/view/V2XMarkerRoadEventView.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/view/V2XMarkerRoadEventView.kt @@ -1,4 +1,4 @@ -package com.mogo.eagle.core.function.v2x.events.view +package com.mogo.eagle.function.biz.v2x.v2n.view import android.content.Context @@ -7,7 +7,7 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.enums.EventTypeEnumNew import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity -import com.mogo.eagle.core.function.v2x.R +import com.mogo.eagle.core.function.biz.R import com.mogo.eagle.core.utilcode.util.ViewUtils import kotlinx.android.synthetic.main.view_marker_event_car.view.* diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi-1920x1000/v_to_x_marker_1.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi-1920x1000/v_to_x_warning_car_red.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_1.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_marker_1.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_marker_1.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_marker_1.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_car_red.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00011.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00011.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00011.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00011.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00012.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00012.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00012.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00012.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00013.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00013.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00013.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00013.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00014.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00014.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00014.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00014.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00015.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00015.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00015.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00015.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00016.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00016.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00016.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00016.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00017.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00017.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00017.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00017.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00018.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00018.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00018.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00018.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00019.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00019.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00019.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00019.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00020.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00020.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00020.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00020.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00021.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00021.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00021.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00021.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00022.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00022.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00022.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00022.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00023.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00023.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00023.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00023.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00024.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00024.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00024.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00024.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00025.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00025.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00025.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00025.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00026.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00026.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00026.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00026.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00027.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00027.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00027.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00027.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00028.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00028.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00028.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00028.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00029.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00029.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00029.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00029.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00030.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00030.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00030.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00030.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00031.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00031.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00031.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00031.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00032.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00032.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00032.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00032.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00033.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00033.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00033.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00033.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00034.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00034.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00034.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00034.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00035.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00035.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00035.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00035.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00036.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00036.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00036.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00036.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00037.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00037.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00037.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00037.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00038.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00038.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00038.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00038.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00039.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00039.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00039.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00039.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00040.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00040.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00040.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00040.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00041.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00041.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00041.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00041.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00042.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00042.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00042.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00042.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00043.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00043.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00043.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00043.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00044.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00044.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00044.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00044.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00045.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00045.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00045.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00045.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00046.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00046.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00046.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00046.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00047.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00047.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00047.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00047.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00048.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00048.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00048.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_orange_00048.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00011.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00011.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00011.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00011.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00012.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00012.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00012.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00012.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00013.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00013.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00013.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00013.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00014.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00014.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00014.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00014.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00015.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00015.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00015.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00015.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00016.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00016.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00016.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00016.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00017.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00017.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00017.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00017.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00018.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00018.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00018.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00018.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00019.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00019.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00019.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00019.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00020.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00020.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00020.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00020.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00021.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00021.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00021.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00021.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00022.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00022.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00022.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00022.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00023.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00023.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00023.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00023.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00024.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00024.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00024.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00024.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00025.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00025.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00025.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00025.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00026.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00026.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00026.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00026.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00027.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00027.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00027.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00027.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00028.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00028.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00028.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00028.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00029.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00029.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00029.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00029.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00030.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00030.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00030.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00030.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00031.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00031.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00031.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00031.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00032.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00032.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00032.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00032.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00033.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00033.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00033.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00033.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00034.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00034.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00034.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00034.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00035.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00035.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00035.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00035.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00036.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00036.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00036.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00036.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00037.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00037.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00037.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00037.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00038.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00038.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00038.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00038.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00039.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00039.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00039.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00039.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00040.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00040.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00040.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00040.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00041.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00041.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00041.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00041.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00042.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00042.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00042.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00042.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00043.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00043.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00043.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00043.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00044.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00044.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00044.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00044.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00045.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00045.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00045.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00045.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00046.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00046.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00046.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00046.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00047.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00047.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00047.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00047.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00048.png b/core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00048.png similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00048.png rename to core/function-impl/mogo-core-function-biz/src/main/res/drawable-xhdpi/v_to_x_warning_circle_red_00048.png diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_marker_event_car.xml b/core/function-impl/mogo-core-function-biz/src/main/res/layout/view_marker_event_car.xml similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_marker_event_car.xml rename to core/function-impl/mogo-core-function-biz/src/main/res/layout/view_marker_event_car.xml diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_marker_event_road.xml b/core/function-impl/mogo-core-function-biz/src/main/res/layout/view_marker_event_road.xml similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/layout/view_marker_event_road.xml rename to core/function-impl/mogo-core-function-biz/src/main/res/layout/view_marker_event_road.xml diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_road_event_data.json b/core/function-impl/mogo-core-function-biz/src/main/res/raw/scenario_road_event_data.json similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_road_event_data.json rename to core/function-impl/mogo-core-function-biz/src/main/res/raw/scenario_road_event_data.json diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_left.json b/core/function-impl/mogo-core-function-biz/src/main/res/raw/scenario_warning_event_data_left.json similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_left.json rename to core/function-impl/mogo-core-function-biz/src/main/res/raw/scenario_warning_event_data_left.json diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json b/core/function-impl/mogo-core-function-biz/src/main/res/raw/scenario_warning_event_data_pedestrians.json similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_pedestrians.json rename to core/function-impl/mogo-core-function-biz/src/main/res/raw/scenario_warning_event_data_pedestrians.json diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_right.json b/core/function-impl/mogo-core-function-biz/src/main/res/raw/scenario_warning_event_data_right.json similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/raw/scenario_warning_event_data_right.json rename to core/function-impl/mogo-core-function-biz/src/main/res/raw/scenario_warning_event_data_right.json diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_coordinates.json b/core/function-impl/mogo-core-function-biz/src/main/res/raw/test_coordinates.json similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_coordinates.json rename to core/function-impl/mogo-core-function-biz/src/main/res/raw/test_coordinates.json diff --git a/core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json b/core/function-impl/mogo-core-function-biz/src/main/res/raw/test_data_v2x_zuiyouluxian.json similarity index 100% rename from core/function-impl/mogo-core-function-v2x/src/main/res/raw/test_data_v2x_zuiyouluxian.json rename to core/function-impl/mogo-core-function-biz/src/main/res/raw/test_data_v2x_zuiyouluxian.json diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index d1cead5ff1..1a12130971 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -124,8 +124,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_FUNC_BIZ, "IMoGoNoticeProvider")); // todo 后置 车聊聊，IM MogoModulePaths.addModuleFunctionServer(new MogoModule(ChatConsts.CHAT_PROVIDER_PATH, ChatConsts.CHAT_MODULE_NAME)); - // V2X 模块 - MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_V2X_MODULE, "V2XProvider")); // 司机身份专属 if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) { // todo 后置 地图数据收集模块 diff --git a/core/function-impl/mogo-core-function-v2x/build.gradle b/core/function-impl/mogo-core-function-v2x/build.gradle index 8e6838c280..6458d99e0d 100644 --- a/core/function-impl/mogo-core-function-v2x/build.gradle +++ b/core/function-impl/mogo-core-function-v2x/build.gradle @@ -45,12 +45,12 @@ dependencies { implementation rootProject.ext.dependencies.androidxccorektx implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout - implementation rootProject.ext.dependencies.localbroadcastmanager + implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.rxandroid kapt rootProject.ext.dependencies.aroutercompiler - implementation rootProject.ext.dependencies.mogoaicloudtrafficlive + implementation rootProject.ext.dependencies.mogoaicloudtrafficlive if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogocommons diff --git a/core/function-impl/mogo-core-function-v2x/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-v2x/src/main/AndroidManifest.xml index 246d716c51..8224f27d8d 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-v2x/src/main/AndroidManifest.xml @@ -2,12 +2,7 @@ - - - - - - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt deleted file mode 100644 index 214567d3fa..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.mogo.eagle.core.function.v2x - -import android.content.Context -import com.alibaba.android.arouter.facade.annotation.Route -import com.mogo.eagle.core.data.config.FunctionBuildConfig -import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_V2X_MODULE -import com.mogo.eagle.core.function.api.v2x.IV2XEventProvider -import com.mogo.eagle.core.function.v2x.events.V2XEventManager -import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils - -@Route(path = PATH_V2X_MODULE) -class V2XProvider : IV2XEventProvider { - - override val functionName: String - get() = "V2XProvider" - - override fun init(context: Context) { - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - //不处理 - } else { - V2XEventManager.init(context) - } - } - - override fun queryWholeRoadEvents() { - V2XEventManager.queryWholeRoadEvents() - } - - override fun onDestroy() { - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) && AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - //不处理 - } else { - V2XEventManager.onDestroy() - } - } -} \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java index c75a31e8cd..e7ef1a087a 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/constants/MogoServicePaths.java @@ -35,12 +35,6 @@ public class MogoServicePaths { @Deprecated public static final String PATH_FLOAT_VIEW_MANAGER = "/floatview/api"; - /** - * v2x 模块 - */ - @Deprecated - public static final String PATH_V2X_MODULE = "/v2x_api/module"; - /** * obu-mogo 模块 */ diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt index 360416ca62..a3e8171204 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt @@ -56,4 +56,8 @@ interface IMoGoFuncBizProvider : IMoGoFunctionServerProvider { fun fetchInfStructures() fun getAllV2XEvents() + + fun queryV2XEvents() + + } \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IV2XEventProvider.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IV2XEventProvider.kt deleted file mode 100644 index 629ed5938d..0000000000 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IV2XEventProvider.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.mogo.eagle.core.function.api.v2x - -import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider - -interface IV2XEventProvider: IMoGoFunctionServerProvider { - fun queryWholeRoadEvents() -} \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt deleted file mode 100644 index 00b48eddf3..0000000000 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerSmpManager.kt +++ /dev/null @@ -1,75 +0,0 @@ -package com.mogo.eagle.core.function.call.map - -import android.os.Looper -import com.alibaba.android.arouter.launcher.ARouter -import com.mogo.eagle.core.data.constants.MogoServicePaths -import com.mogo.eagle.core.data.map.MogoLatLng -import com.mogo.eagle.core.function.api.v2x.IV2XEventProvider -import com.mogo.eagle.core.function.call.base.CallerBase -import com.mogo.eagle.core.utilcode.util.UiThreadHandler - -/** - * @author xiaoyuzhou - * @date 2021/9/17 6:15 下午 - * 小地图调用者管理，这里对外及其他模块提供小地图功能的调用，用啥写啥，不要过度设计，不允许直接将Provider暴露出去 - */ -object CallerSmpManager : CallerBase() { - - private val v2xProvider: IV2XEventProvider - get() = ARouter.getInstance().build(MogoServicePaths.PATH_V2X_MODULE) - .navigation() as IV2XEventProvider - - /** - * 绘制路径线 - */ - @JvmStatic - fun drawablePolyline(coordinates: List?) { -// mogoSmallMapProvider.drawablePolyline(coordinates) - } - - /** - * 清除路径线 - */ - @JvmStatic - fun clearPolyline() { -// mogoSmallMapProvider.clearPolyline() - } - - /** - * 显示面板 - */ - @JvmStatic - fun showPanel() { -// mogoSmallMapProvider.showPanel() - } - - /** - * 隐藏面板 - */ - @JvmStatic - fun hidePanel() { -// mogoSmallMapProvider.hidePanel() - } - - @JvmStatic - fun startQueryV2XEvents() { - if (Thread.currentThread() !== Looper.getMainLooper().thread) { - UiThreadHandler.post { - v2xProvider.queryWholeRoadEvents() - } - } else { - v2xProvider.queryWholeRoadEvents() - } - } - - @JvmStatic - fun clearV2XMarkers() { -// if (Thread.currentThread() !== Looper.getMainLooper().thread) { -// UiThreadHandler.post { -// mogoOverViewMapProvider.clearV2XMarkers() -// } -// } else { -// mogoOverViewMapProvider.clearV2XMarkers() -// } - } -} \ No newline at end of file From ae443b4d43aea5a74a32537cdd99f32330ac3ffe Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 17 Feb 2023 21:40:31 +0800 Subject: [PATCH 09/10] [2.13.0-arch-opt] merge problem --- .../eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java | 2 +- .../eagle/function/biz/v2x/v2n/test/TestOnLineCarUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java index 4038b75603..a144505d5c 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/marker/V2XMarkerAdapter.java @@ -4,7 +4,7 @@ import android.content.Context; import android.graphics.Bitmap; import com.mogo.eagle.core.data.enums.EventTypeEnumNew; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; -import com.mogo.eagle.core.function.v2x.R; +import com.mogo.eagle.core.function.biz.R; import com.mogo.eagle.function.biz.v2x.v2n.view.V2XMarkerRoadEventView; import java.util.ArrayList; diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestOnLineCarUtils.java b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestOnLineCarUtils.java index 8a0c63380c..ed34ea7a0f 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestOnLineCarUtils.java +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/test/TestOnLineCarUtils.java @@ -7,8 +7,8 @@ import com.mogo.eagle.core.data.map.entity.MarkerLocation; import com.mogo.eagle.core.data.map.entity.V2XMessageEntity; import com.mogo.eagle.core.data.map.entity.V2XRoadEventEntity; import com.mogo.eagle.core.data.map.entity.V2XWarningEntity; -import com.mogo.eagle.core.function.v2x.R; import com.mogo.eagle.core.data.v2x.V2XOptimalRouteDataRes; +import com.mogo.eagle.core.function.biz.R; import com.mogo.eagle.core.network.utils.GsonUtil; import com.mogo.eagle.core.utilcode.util.Utils; From 51f3308cb23b908c202d2c265addbf85dba47b3b Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 17 Feb 2023 21:52:53 +0800 Subject: [PATCH 10/10] [2.13.0-arch-opt] remove v2x module and wait to union logic --- app/build.gradle | 1 - .../mogo-core-function-v2x/.gitignore | 1 - .../mogo-core-function-v2x/build.gradle | 68 ------------------- .../mogo-core-function-v2x/consumer-rules.pro | 0 .../mogo-core-function-v2x/gradle.properties | 3 - .../mogo-core-function-v2x/proguard-rules.pro | 21 ------ .../src/main/AndroidManifest.xml | 8 --- modules.txt | 1 - settings.gradle | 2 - 9 files changed, 105 deletions(-) delete mode 100644 core/function-impl/mogo-core-function-v2x/.gitignore delete mode 100644 core/function-impl/mogo-core-function-v2x/build.gradle delete mode 100644 core/function-impl/mogo-core-function-v2x/consumer-rules.pro delete mode 100644 core/function-impl/mogo-core-function-v2x/gradle.properties delete mode 100644 core/function-impl/mogo-core-function-v2x/proguard-rules.pro delete mode 100644 core/function-impl/mogo-core-function-v2x/src/main/AndroidManifest.xml diff --git a/app/build.gradle b/app/build.gradle index bd4379bfe4..f9c79c925d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -369,7 +369,6 @@ dependencies { implementation project(':tts:tts-pad') implementation project(':core:function-impl:mogo-core-function-hmi') implementation project(':core:function-impl:mogo-core-function-map') - implementation project(':core:function-impl:mogo-core-function-v2x') implementation project(':core:function-impl:mogo-core-function-datacenter') implementation project(':core:function-impl:mogo-core-function-devatools') implementation project(':core:function-impl:mogo-core-function-chat') diff --git a/core/function-impl/mogo-core-function-v2x/.gitignore b/core/function-impl/mogo-core-function-v2x/.gitignore deleted file mode 100644 index 42afabfd2a..0000000000 --- a/core/function-impl/mogo-core-function-v2x/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/build.gradle b/core/function-impl/mogo-core-function-v2x/build.gradle deleted file mode 100644 index 6458d99e0d..0000000000 --- a/core/function-impl/mogo-core-function-v2x/build.gradle +++ /dev/null @@ -1,68 +0,0 @@ -plugins { - id 'com.android.library' - id 'kotlin-android' - id 'kotlin-android-extensions' - id 'kotlin-kapt' - id 'com.alibaba.arouter' -} -android { - compileSdkVersion rootProject.ext.android.compileSdkVersion - defaultConfig { - minSdkVersion rootProject.ext.android.minSdkVersion - targetSdkVersion rootProject.ext.android.targetSdkVersion - versionCode Integer.valueOf(VERSION_CODE) - versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION") - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - //ARouter apt 参数 - kapt { - useBuildCache = false - arguments { - arg("AROUTER_MODULE_NAME", project.getName()) - } - } - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation rootProject.ext.dependencies.kotlinstdlibjdk7 - implementation rootProject.ext.dependencies.coroutinescore - implementation rootProject.ext.dependencies.coroutinesandroid - implementation rootProject.ext.dependencies.androidxccorektx - implementation rootProject.ext.dependencies.androidxappcompat - implementation rootProject.ext.dependencies.androidxconstraintlayout - - implementation rootProject.ext.dependencies.arouter - implementation rootProject.ext.dependencies.rxandroid - kapt rootProject.ext.dependencies.aroutercompiler - - implementation rootProject.ext.dependencies.mogoaicloudtrafficlive - - if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogocommons - implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogo_core_res - } else { - implementation project(":foudations:mogo-commons") - implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-function-call') - implementation project(':core:mogo-core-res') - } -} - -apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/core/function-impl/mogo-core-function-v2x/consumer-rules.pro b/core/function-impl/mogo-core-function-v2x/consumer-rules.pro deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/core/function-impl/mogo-core-function-v2x/gradle.properties b/core/function-impl/mogo-core-function-v2x/gradle.properties deleted file mode 100644 index 63866596d3..0000000000 --- a/core/function-impl/mogo-core-function-v2x/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -GROUP=com.mogo.eagle.core.function.impl -POM_ARTIFACT_ID=v2x -VERSION_CODE=1 diff --git a/core/function-impl/mogo-core-function-v2x/proguard-rules.pro b/core/function-impl/mogo-core-function-v2x/proguard-rules.pro deleted file mode 100644 index 481bb43481..0000000000 --- a/core/function-impl/mogo-core-function-v2x/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-v2x/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-v2x/src/main/AndroidManifest.xml deleted file mode 100644 index 8224f27d8d..0000000000 --- a/core/function-impl/mogo-core-function-v2x/src/main/AndroidManifest.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/modules.txt b/modules.txt index acc4c7544b..a44a7cf029 100644 --- a/modules.txt +++ b/modules.txt @@ -20,7 +20,6 @@ :core:function-impl:mogo-core-function-datacenter :core:function-impl:mogo-core-function-hmi :core:function-impl:mogo-core-function-map -:core:function-impl:mogo-core-function-v2x :core:function-impl:mogo-core-function-chat :core:function-impl:mogo-core-function-devatools :core:function-impl:mogo-core-function-biz diff --git a/settings.gradle b/settings.gradle index 45b91c2c77..b04aa2b3f4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -26,8 +26,6 @@ include ':core:function-impl:mogo-core-function-hmi' // 小地图控件 // 地图控件，HD-高精地图 include ':core:function-impl:mogo-core-function-map' -// v2x预警业务，本地+云端预警 -include ':core:function-impl:mogo-core-function-v2x' // 车聊聊业务 include ':core:function-impl:mogo-core-function-chat' // 业务biz