diff --git a/app/build.gradle b/app/build.gradle
index 0cdd1b7736..696bd12edc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
-apply from: rootProject.file('gradle/bytex/bytex.gradle')
+//apply from: rootProject.file('gradle/bytex/bytex.gradle')
Properties properties = new Properties()
properties.load(project.rootProject.file("gradle.properties").newDataInputStream())
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
index e092cf8387..53561394c6 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -2,7 +2,6 @@ package com.mogo.eagle.function.biz.v2x.trafficlight.core
import android.content.Context
import android.os.Handler
-import android.os.HandlerThread
import android.os.Looper
import com.mogo.eagle.core.data.biz.trafficlight.RoadIDResult
import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightControl
@@ -10,6 +9,7 @@ import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
import com.mogo.eagle.core.data.biz.trafficlight.isInRange
import com.mogo.eagle.core.data.map.MogoLocation
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
+import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager
import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
@@ -23,7 +23,7 @@ import com.mogo.eagle.function.biz.v2x.trafficlight.network.TrafficLightNetWorkM
import com.zhidaoauto.map.data.road.RoadCross
class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener,
- CallerMapRoadListenerManager.OnRoadListener {
+ IMoGoMapRoadListener {
companion object {
@@ -52,7 +52,7 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener,
fun initServer(context: Context) {
mContext = context
CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
- CallerMapRoadListenerManager.registerRoadListener(TAG, this)
+ CallerMapRoadListenerManager.addListener(TAG, this)
mThreadHandler =
TrafficLightThreadHandler(Looper.getMainLooper(), {
//第一次查询路口时，如果红绿灯显示，则隐藏掉
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt
index 8fcf73fa29..4b074c39f6 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/V2XEventManager.kt
@@ -32,6 +32,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
import com.mogo.eagle.core.function.api.autopilot.IMoGoV2XListener
import com.mogo.eagle.core.function.api.cloud.IMoGoCloudListener
+import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener
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
@@ -42,7 +43,6 @@ import com.mogo.eagle.core.function.call.autopilot.CallerV2XListenerManager.V2NC
import com.mogo.eagle.core.function.call.cloud.CallerCloudListenerManager
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager
-import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.OnRoadListener
import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
@@ -79,7 +79,7 @@ import java.util.concurrent.atomic.AtomicReference
object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
IMoGoAutopilotIdentifyListener, IMoGoCloudListener,
- IMoGoV2XListener, IMoGoAutopilotStatusListener, OnRoadListener {
+ IMoGoV2XListener, IMoGoAutopilotStatusListener, IMoGoMapRoadListener {
private const val TAG = "V2XEventManager"
@@ -108,7 +108,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
v2xPoiLoader.startLoopPoi()
// 注册广播接收场景弹窗使用的
SceneBroadcastReceiver.register(context)
- CallerMapRoadListenerManager.registerRoadListener(TAG, this)
+ CallerMapRoadListenerManager.addListener(TAG, this)
}
}
@@ -363,7 +363,7 @@ object V2XEventManager : IMoGoChassisLocationGCJ02Listener, IV2XCallback,
unRegisterListener()
}
v2xPoiLoader.stopLoopPoi()
- CallerMapRoadListenerManager.unRegisterRoadListener(TAG)
+ CallerMapRoadListenerManager.removeListener(TAG)
}
}
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt
new file mode 100644
index 0000000000..4c6a5645e1
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt
@@ -0,0 +1,26 @@
+package com.mogo.eagle.core.function.hmi.ui.camera
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.hmi.R
+
+class RoadCrossLiveView @JvmOverloads constructor(
+ context: Context,
+ attrs: AttributeSet? = null,
+ defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+
+ init {
+ LayoutInflater.from(context).inflate(R.layout.view_road_cross_live, this, true)
+ }
+
+ override fun onAttachedToWindow() {
+ super.onAttachedToWindow()
+ }
+
+ override fun onDetachedFromWindow() {
+ super.onDetachedFromWindow()
+ }
+}
\ 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/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 96abdb293e..734ef44762 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
@@ -420,16 +420,16 @@ internal class DebugSettingView @JvmOverloads constructor(
*/
tbStatusCenter.setOnCheckedChangeListener { buttonView, isChecked ->
val cross = RoadCross()
- CallerMapRoadListenerManager.invokeRoadChange(0, cross)
-// if (isChecked) {
-// buttonView.setCompoundDrawables(null, null, iconDown, null)
-// //展示状态中心
-// statusCenterLayout.visibility = View.VISIBLE
-// } else {
-// buttonView.setCompoundDrawables(null, null, iconRight, null)
-// //隐藏状态中心
-// statusCenterLayout.visibility = View.GONE
-// }
+// CallerMapRoadListenerManager.invokeRoadChange(0, cross)
+ if (isChecked) {
+ buttonView.setCompoundDrawables(null, null, iconDown, null)
+ //展示状态中心
+ statusCenterLayout.visibility = View.VISIBLE
+ } else {
+ buttonView.setCompoundDrawables(null, null, iconRight, null)
+ //隐藏状态中心
+ statusCenterLayout.visibility = View.GONE
+ }
}
/**
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml
new file mode 100644
index 0000000000..77d9ef65f8
--- /dev/null
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live.xml
@@ -0,0 +1,6 @@
+
+
+
+
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
index 9a844bc788..9378ca4ffe 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
@@ -15,9 +15,9 @@ import com.mogo.eagle.core.function.angle.scenes.Default
import com.mogo.eagle.core.function.angle.scenes.RoadEvent
import com.mogo.eagle.core.function.api.map.angle.*
import com.mogo.eagle.core.function.api.map.angle.Scene
+import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener
import com.mogo.eagle.core.function.call.autopilot.*
import com.mogo.eagle.core.function.call.map.*
-import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager.OnRoadListener
import com.mogo.eagle.core.utilcode.kotlin.*
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
import com.zhidaoauto.map.data.road.StopLine
@@ -61,7 +61,7 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
PriorityQueue()
}
- private val listener = object : OnRoadListener {
+ private val listener = object : IMoGoMapRoadListener {
private val roadId = AtomicReference()
private val triggerRoadId = AtomicReference()
@@ -122,11 +122,11 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
ctx.lifeCycleOwner.lifecycle.addObserver(object : LifecycleEventObserver {
override fun onStateChanged(source: LifecycleOwner, event: Event) {
if (event == ON_DESTROY) {
- CallerMapRoadListenerManager.unRegisterRoadListener("VisualAngleChange")
+ CallerMapRoadListenerManager.removeListener(TAG)
}
}
})
- CallerMapRoadListenerManager.registerRoadListener("VisualAngleChange", listener)
+ CallerMapRoadListenerManager.addListener(TAG, listener)
}
@Volatile
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt
index 337d39d80e..d543ce1d30 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/RoadCrossCameraManager.kt
@@ -3,8 +3,10 @@ package com.mogo.eagle.core.function.business.roadcross
import android.annotation.SuppressLint
import android.content.Context
import android.util.Log
+import com.mogo.commons.debug.DebugConfig
import com.mogo.eagle.core.data.deva.chain.ChainConstant
import com.mogo.eagle.core.data.road.CameraDeviceInfo
+import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener
import com.mogo.eagle.core.function.business.roadcross.net.NDERoadCameraNetWorkModel.Companion.ndeRoadCameraNetWorkModel
import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager
@@ -12,6 +14,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
import com.mogo.eagle.core.function.view.CameraMarkerView
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
+import com.mogo.eagle.core.utilcode.util.ToastUtils
import com.mogo.map.overlay.core.Level
import com.mogo.map.overlay.point.Point
import com.zhidaoauto.map.data.road.RoadCross
@@ -19,7 +22,7 @@ import com.zhidaoauto.map.data.road.StopLine
import com.zhjt.service.chain.ChainLog
import kotlin.properties.Delegates
-class RoadCrossCameraManager : CallerMapRoadListenerManager.OnRoadListener {
+class RoadCrossCameraManager : IMoGoMapRoadListener {
companion object {
private const val TAG = "RoadCrossCameraManager"
@@ -41,7 +44,7 @@ class RoadCrossCameraManager : CallerMapRoadListenerManager.OnRoadListener {
fun init(context: Context?) {
mContext = context
- CallerMapRoadListenerManager.registerRoadListener(TAG, this)
+ CallerMapRoadListenerManager.addListener(TAG, this)
}
//todo 记录方法执行时间
@@ -56,7 +59,7 @@ class RoadCrossCameraManager : CallerMapRoadListenerManager.OnRoadListener {
if (roadCrossEnd != null) {
ndeRoadCameraNetWorkModel.getRoadCrossInfo(roadCrossEnd,
onSuccess = {
- if (it.roadUniqueId == null) {
+ if (it.crossingId == null) {
traceError("roadUniqueId is null")
return@getRoadCrossInfo
}
@@ -64,10 +67,6 @@ class RoadCrossCameraManager : CallerMapRoadListenerManager.OnRoadListener {
traceError("deviceInfoList isEmpty")
return@getRoadCrossInfo
}
- if (it.roadUniqueId != roadCrossEnd) {
- traceError("cloud roadId :${it.roadUniqueId} is not equal currentCross : $roadCrossEnd")
- return@getRoadCrossInfo
- }
roadCrossCameraList = it.deviceInfoList
// 地图上打marker(注意marker方向)，marker点击获取对应ip
it.deviceInfoList.forEach { deviceInfo ->
@@ -86,6 +85,7 @@ class RoadCrossCameraManager : CallerMapRoadListenerManager.OnRoadListener {
}
private fun addCameraDeviceMarker(cameraDeviceInfo: CameraDeviceInfo) {
+ Log.d("emArrow","add marker:${cameraDeviceInfo.deviceIp}")
mContext?.let {
val builder =
Point.Options.Builder(TAG, Level.MAP_MARKER)
@@ -102,11 +102,11 @@ class RoadCrossCameraManager : CallerMapRoadListenerManager.OnRoadListener {
.onClick { id ->
Log.d("emArrow", "Marker click :$id")
ndeRoadCameraNetWorkModel.singleRequestCrossLive(id,
- onSuccess = {
-
+ onSuccess = { live ->
+ CallerMapRoadListenerManager.invokeRoadCrossLive(live)
},
- onError = {
-
+ onError = {errorMsg ->
+ traceError(" ${cameraDeviceInfo.deviceIp} click request error :$errorMsg")
})
}
CallerLogger.d("$M_MAP$TAG", "new road cross camera=$overlayManager")
@@ -135,12 +135,12 @@ class RoadCrossCameraManager : CallerMapRoadListenerManager.OnRoadListener {
override fun onRoadChange(cross: Boolean, roadCross: RoadCross?) {
super.onRoadChange(cross, roadCross)
-// val data = CameraDeviceInfo("172.18.1.60", 112.582913287, 26.9320508672) //todo emArrow test
-// addCameraDeviceMarker(data)
-// val data1 = CameraDeviceInfo("172.18.1.42", 112.582947017, 26.9328373092)
-// addCameraDeviceMarker(data1)
-// val data2 = CameraDeviceInfo("172.18.1.72", 112.582421, 26.932519)
-// addCameraDeviceMarker(data2)
+ val data = CameraDeviceInfo("172.18.1.60", 112.582913287, 26.9320508672) //todo emArrow test
+ addCameraDeviceMarker(data)
+ val data1 = CameraDeviceInfo("172.18.1.42", 112.582947017, 26.9328373092)
+ addCameraDeviceMarker(data1)
+ val data2 = CameraDeviceInfo("172.18.1.72", 112.582421, 26.932519)
+ addCameraDeviceMarker(data2)
// 出路口
if (!cross) {
@@ -149,15 +149,20 @@ class RoadCrossCameraManager : CallerMapRoadListenerManager.OnRoadListener {
// 清除marker
roadCrossCameraList?.let {
it.forEach { camera ->
+ Log.d("emArrow","remove marker:${camera.deviceIp}")
overlayManager?.removePoint(camera.deviceIp)
}
}
// 释放控制
isCameraRequest = false
+ Log.d("emArrow", "经过路口，释放控制")
}
}
private fun traceError(msg: String) {
+ if(DebugConfig.isDebug()){
+ ToastUtils.showLong(msg)
+ }
val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
roadCrossTrace(
TAG, mapOf(
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/net/INDERoadCameraApiService.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/net/INDERoadCameraApiService.kt
index be6a630256..2b85b89edb 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/net/INDERoadCameraApiService.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/net/INDERoadCameraApiService.kt
@@ -24,7 +24,7 @@ interface INDERoadCameraApiService {
@Query("roadUniqueId") roadId: String,
@Query("lon") lon: Double,
@Query("lat") lat: Double
- ): BaseResponse
+ ): BaseResponse>
// 单ip查询设备直播流与缩略图
@GET(SINGLE_LIVE)
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/net/NDERoadCameraNetWorkModel.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/net/NDERoadCameraNetWorkModel.kt
index dd580e5313..299ab9e6c9 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/net/NDERoadCameraNetWorkModel.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/roadcross/net/NDERoadCameraNetWorkModel.kt
@@ -30,7 +30,7 @@ class NDERoadCameraNetWorkModel private constructor() {
onSuccess: ((RoadCrossCamera) -> Unit),
onError: ((String) -> Unit)
) {
- request>("roadCross") {
+ request>>("roadCross") {
loader {
apiCall {
val loc = CallerChassisLocationWGS84ListenerManager.getChassisLocationWGS84()
@@ -45,7 +45,11 @@ class NDERoadCameraNetWorkModel private constructor() {
}
}
onSuccess {
- onSuccess.invoke(it.result)
+ if(it.result.isNotEmpty()){
+ onSuccess.invoke(it.result[0])
+ }else{
+ onError.invoke("getRoadCrossInfo empty camera info")
+ }
}
onError {
onError.invoke(it.message.toString())
@@ -112,7 +116,7 @@ class NDERoadCameraNetWorkModel private constructor() {
private fun getAuth(url: String): Pair {
val time = System.currentTimeMillis().toString()
- val md5String = "${url.uppercase(Locale.getDefault())}$time"
+ val md5String = "/${url.uppercase(Locale.getDefault())}$time"
val auth = Md5Util.getMD5Result(md5String)
return Pair(auth, time)
}
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
index cebf36fe4f..b084403520 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/MapBizView.kt
@@ -59,7 +59,7 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context,
//设置倾斜手势是否可用。
it.setTiltGesturesEnabled(false)
//设置双指缩放手势是否可用。
- it.setZoomGesturesEnabled(true)
+ it.setZoomGesturesEnabled(false) //true todo emArrow test
}
}
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
index 1afb053c11..20a0e776ba 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt
@@ -106,6 +106,7 @@ class ChainConstant {
const val CHAIN_CODE_V2X_MSG = "CHAIN_CODE_V2X_MSG"
const val CHAIN_CODE_HD_MAP_CALL = "CHAIN_CODE_HD_MAP_CALL"
const val CHAIN_CODE_HD_MAP_ROAD_CROSS = "CHAIN_CODE_HD_MAP_ROAD_CROSS"
+ const val CHAIN_CODE_HD_MAP_ROAD_LIVE = "CHAIN_CODE_HD_MAP_ROAD_LIVE"
const val CHAIN_CODE_HD_MAP_ICON_SET = "CHAIN_CODE_HD_MAP_ICON_SET"
const val CHAIN_CODE_HMI_ACTIONS = "CHAIN_CODE_HMI_ACTIONS"
const val CHAIN_CODE_CERT_REQUEST = "CHAIN_CODE_CERT_REQUEST"
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/road/RoadCrossCamera.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/road/RoadCrossCamera.kt
index 5e7c9ca480..1336f47e1c 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/road/RoadCrossCamera.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/road/RoadCrossCamera.kt
@@ -2,7 +2,7 @@ package com.mogo.eagle.core.data.road
//接口请求路侧，返回设备信息
data class RoadCrossCamera(
- val crossingId: String, // 路侧对应ID(衡阳1-25号路口)
+ val crossingId: String? = null, // 路侧对应ID(衡阳1-25号路口)
val roadUniqueId: String? = null, // 高精地图crossID
val lon: Double, // 路口多设备经纬度中心点lon
val lat: Double, // 路口多设备经纬度中心点lat
diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/road/IMoGoMapRoadListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/road/IMoGoMapRoadListener.kt
new file mode 100644
index 0000000000..1110d437a1
--- /dev/null
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/road/IMoGoMapRoadListener.kt
@@ -0,0 +1,21 @@
+package com.mogo.eagle.core.function.api.map.road
+
+import com.mogo.eagle.core.data.road.RoadCameraLive
+import com.zhidaoauto.map.data.road.RoadCross
+import com.zhidaoauto.map.data.road.StopLine
+
+/**
+ *
+ */
+interface IMoGoMapRoadListener {
+
+ fun onRoadIdInfo(roadId: String) {}
+
+ fun onStopLineInfo(info: StopLine) {}
+
+ fun onRoadChange(cross: Boolean, roadCross: RoadCross? = null) {}
+
+ fun onCrossLiveInfo(info: RoadCameraLive) {}
+
+
+}
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt
index 75922f9fc4..4cd26da1c5 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapRoadListenerManager.kt
@@ -1,73 +1,62 @@
package com.mogo.eagle.core.function.call.map
import com.mogo.eagle.core.data.deva.chain.ChainConstant
+import com.mogo.eagle.core.data.road.RoadCameraLive
+import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener
+import com.mogo.eagle.core.function.call.base.CallerBase
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_MAP
import com.zhidaoauto.map.data.road.RoadCross
import com.zhidaoauto.map.data.road.StopLine
import com.zhjt.service.chain.ChainLog
-import java.util.concurrent.ConcurrentHashMap
import kotlin.properties.Delegates
-object CallerMapRoadListenerManager {
+object CallerMapRoadListenerManager : CallerBase() {
- interface OnRoadListener {
+ private var mRoadId: String? = null
+ private var mStopLine: StopLine? = null
+ private var mRoadChange = false
+ private var mRoadCross: RoadCross? = null
- fun onRoadIdInfo(roadId: String) {}
-
- fun onStopLineInfo(info: StopLine) {}
-
- fun onRoadChange(cross: Boolean, roadCross: RoadCross? = null) {}
- }
-
- private val listeners by lazy {
- ConcurrentHashMap()
- }
-
- fun registerRoadListener(tag: String, listener: OnRoadListener) {
- if (listeners.contains(tag)) {
- return
+ private var mCross: Int by Delegates.observable(-1) { _, oldValue, newValue ->
+// if (oldValue != newValue) { //todo emArrow test
+ CallerLogger.d("$M_MAP onRoadChange observable", newValue)
+ M_LISTENERS.forEach { entry ->
+ // false:1,2, 离开路口，进入路段
+ // true: 进入路口
+ mRoadChange = !(newValue == 1 || newValue == 2)
+ entry.value.onRoadChange(mRoadChange, mRoadCross)
}
- listeners[tag] = listener
+// }
}
- fun unRegisterRoadListener(tag: String) {
- if (!listeners.contains(tag)) {
- return
+ override fun doSomeAfterAddListener(tag: String, listener: IMoGoMapRoadListener) {
+ super.doSomeAfterAddListener(tag, listener)
+ mRoadId?.let {
+ listener.onRoadIdInfo(it)
+ }
+ mStopLine?.let {
+ listener.onStopLineInfo(it)
+ }
+ if(mCross != -1 && mRoadCross != null){
+ listener.onRoadChange(mRoadChange, mRoadCross)
}
- listeners.remove(tag)
}
-
fun invokeListenersOnRoadIdGet(roadId: String) {
- listeners.forEach { entry ->
+ mRoadId = roadId
+ M_LISTENERS.forEach { entry ->
entry.value.onRoadIdInfo(roadId)
}
}
- private var mStopLine:StopLine? = null
-
fun invokeListenersOnStopLineGet(stopLine: StopLine) {
mStopLine = stopLine
- listeners.forEach { entry ->
+ M_LISTENERS.forEach { entry ->
entry.value.onStopLineInfo(stopLine)
}
}
- private var mCross: Int by Delegates.observable(-1) { _, oldValue, newValue ->
-// if (oldValue != newValue) {
- CallerLogger.d("$M_MAP onRoadChange observable", newValue)
- listeners.forEach { entry ->
- when (newValue) {
- 1, 2 -> entry.value.onRoadChange(false, mRoadCross)
- else -> entry.value.onRoadChange(true, mRoadCross)
- }
- }
-// }
- }
-
- private var mRoadCross: RoadCross? = null
-
fun getCrossInfo(): RoadCross? {
return mRoadCross
}
@@ -79,10 +68,24 @@ object CallerMapRoadListenerManager {
paramIndexes = [0, 1]
)
fun invokeRoadChange(cross: Int, roadCross: RoadCross) {
- CallerLogger.d("$M_MAP onRoadChange", "oldValue: $mCross , " + "mStopLine:${mStopLine?.distance}" +
- "newValue: $cross , oldCross:$mRoadCross , newCross:$roadCross")
+ CallerLogger.d(
+ "$M_MAP onRoadChange", "oldValue: $mCross , " + "mStopLine:${mStopLine?.distance}" +
+ "newValue: $cross , oldCross:$mRoadCross , newCross:$roadCross"
+ )
mCross = cross
mRoadCross = roadCross
}
+
+ @ChainLog(
+ linkChainLog = ChainConstant.CHAIN_TYPE_STATUS,
+ linkCode = ChainConstant.CHAIN_SOURCE_MAP,
+ nodeAliasCode = ChainConstant.CHAIN_CODE_HD_MAP_ROAD_LIVE,
+ paramIndexes = [0]
+ )
+ fun invokeRoadCrossLive(info: RoadCameraLive){
+ M_LISTENERS.forEach { entry ->
+ entry.value.onCrossLiveInfo(info)
+ }
+ }
}
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapStyleListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/map/CallerMapStyleListenerManager.kt
deleted file mode 100644
index e69de29bb2..0000000000