diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt index 842dd31329..fcc51df921 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt @@ -67,7 +67,8 @@ class CameraListView : FrameLayout { private val liveStreamManager by lazy { LiveStreamManagerImpl.getInstance( context.applicationContext as Application?, - MoGoAiCloudClientConfig.getInstance().sn + MoGoAiCloudClientConfig.getInstance().sn, + false ) } private var liveSn: String? = "" @@ -336,11 +337,16 @@ class CameraListView : FrameLayout { try { GSYVideoManager.releaseAllVideos() } catch (e: Exception) { + Logger.e(TAG, "stopLive exception msg is:${e.message},cause is:${e.cause}") e.printStackTrace() } } else -> { - if (!liveSn.isNullOrEmpty()) MoGoAiCloudTrafficLive.stopCarLive(liveSn) + if (!liveSn.isNullOrEmpty()) { + MoGoAiCloudTrafficLive.stopCarLive(liveSn) + } else { + Logger.d(TAG, "StopCarLive sn is null or empty!") + } } } } diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt index b95ddaf5af..ecd0f849f0 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt @@ -20,6 +20,7 @@ import kotlin.math.floor class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener { private var vip: Boolean = false + private var isFirst = false companion object { @@ -31,16 +32,26 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener { } override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) { - getCurrentRoadTrafficLight(trafficLightResult)?.let { - handleRedLightWarning(it, trafficLightResult.flashYellow) + Logger.d(TAG, "处理路口交通数据。isFirst为:${isFirst}") + if (isFirst) { + getCurrentRoadTrafficLight(trafficLightResult)?.let { + handleRedLightWarning(it, trafficLightResult.flashYellow) + } + isFirst = false } } + override fun onEnterCrossRoad() { + Logger.d(TAG, "进入路口") + isFirst = true + } + override fun onVipSet(status: Boolean) { vip = status } fun listenTrafficLight() { + CallTrafficLightListenerManager.registerEnterCrossRoadListener(TAG, this) CallTrafficLightListenerManager.registerTrafficLightListener(TAG, this) CallVipSetListenerManager.registerVipSetListener(TAG, this) } diff --git a/gradle.properties b/gradle.properties index 694ccaeb4b..e37c881249 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,21 +63,21 @@ SERVICE_CHAIN_VERSION=1.0.30 LOGLIB_VERSION=1.0.4 ######## MogoAiCloudSDK Version ######## # 网络请求 -MOGO_NETWORK_VERSION=1.3.9 +MOGO_NETWORK_VERSION=1.3.13 # 鉴权 -MOGO_PASSPORT_VERSION=1.3.9 +MOGO_PASSPORT_VERSION=1.3.13 # 常链接 -MOGO_SOCKET_VERSION=1.3.9 +MOGO_SOCKET_VERSION=1.3.13 # 数据采集 -MOGO_REALTIME_VERSION=1.3.9 +MOGO_REALTIME_VERSION=1.3.13 # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.3.9 +MOGO_TANLU_VERSION=1.3.13 # 直播推流 -MOGO_LIVE_VERSION=1.3.9 +MOGO_LIVE_VERSION=1.3.13 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.3.9 +MOGO_TRAFFICLIVE_VERSION=1.3.13 # 定位服务 -MOGO_LOCATION_VERSION=1.3.9 +MOGO_LOCATION_VERSION=1.3.13 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=V2.0.0.9 diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java index e5e1609fbb..c602294c43 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainPresenter.java @@ -56,7 +56,7 @@ public class MainPresenter extends Presenter< MainView > { boolean isAllGranted = checkPermissionAllGranted( new String[]{ Manifest.permission.RECORD_AUDIO, - Manifest.permission.CAMERA, +// Manifest.permission.CAMERA, Manifest.permission.BLUETOOTH, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, @@ -75,7 +75,7 @@ public class MainPresenter extends Presenter< MainView > { activity, new String[]{ Manifest.permission.RECORD_AUDIO, - Manifest.permission.CAMERA, +// Manifest.permission.CAMERA,前行 Manifest.permission.BLUETOOTH, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java index b3e54be18c..310188a4ef 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XVoiceCallLiveBiz.java @@ -143,7 +143,7 @@ public class V2XVoiceCallLiveBiz implements IMogoMarkerClickListener { */ public void getFrontCarLive() { LiveStreamManagerImpl.getInstance(AbsMogoApplication.getApp(), - MoGoAiCloudClientConfig.getInstance().getThirdPartyDeviceId()); + MoGoAiCloudClientConfig.getInstance().getThirdPartyDeviceId(), false); V2XMessageEntity v2XMessageEntity = buildCallLiveParams(null, null, V2XMessageEntity.V2XTypeEnum.ALERT_VOICE_CALL_FOR_LIVECAR_SHOW); V2XScenarioManager.getInstance().handlerMessage(v2XMessageEntity); }