From 1c1eba9bcac7d0517526ea2037c14983abc5aca5 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 1 Dec 2021 17:03:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[Fix]=E5=80=92=E8=AE=A1=E6=97=B6=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E7=9B=B4=E6=92=AD=E9=A1=B5=E5=BE=97=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/eagle/core/function/hmi/ui/camera/CameraListView.kt | 1 + 1 file changed, 1 insertion(+) 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 ccaf2b79c6..26ea51d796 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 @@ -200,6 +200,7 @@ class CameraListView : FrameLayout { clickListener?.refreshCameraList() clickListener?.onShowLive(false) } + isFirstPage = true isPlaySuccess = false } else -> { From ebe4d8b133136318ab3c20f2a8d05631998a9f88 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Wed, 1 Dec 2021 18:44:43 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[Fix]=E4=BB=85=E5=8F=B3=E8=BD=AC=E8=BF=87?= =?UTF-8?q?=E5=8E=BB=E4=B8=8D=E5=A4=84=E7=90=86=E7=BA=A2=E7=81=AF=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E5=92=8C=E7=BB=BF=E7=81=AF=E9=80=9A=E8=A1=8C=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/v2x/redlightwarning/RedLightWarningManager.kt | 4 ++++ .../java/com/mogo/eagle/core/data/trafficlight/RoadArrow.kt | 4 ++++ .../mogo/eagle/core/data/trafficlight/TrafficLightResult.kt | 4 ++++ .../eagle/core/data/trafficlight/TrafficLightStatusHelper.kt | 5 +++++ 4 files changed, 17 insertions(+) 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 1f267f14df..964be8caf0 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 @@ -45,6 +45,10 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) { // 到路口100m时回调 Logger.d(TAG, "处理路口交通数据：是否是第一次处理：${isFirst}是否进入路口：${isEnter}") + if (trafficLightResult.currentRoadIsRight()) { + Logger.d(TAG,"当前道路右转，不处理") + return + } if (isFirst && !isEnter) { getCurrentRoadTrafficLight(trafficLightResult)?.let { handleRedLightWarning(it, trafficLightResult) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadArrow.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadArrow.kt index c63ba750d1..d2dc51943c 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadArrow.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/RoadArrow.kt @@ -25,6 +25,10 @@ class RoadArrow { fun isRight(arrowId: Int): Boolean { return arrowId == TURN_RIGHT || arrowId == STRAIGHT_OR_RIGHT || arrowId == TURN_LEFT_OR_RIGHT } + + fun isOnlyRight(arrowId: Int): Boolean { + return arrowId == TURN_RIGHT + } } } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightResult.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightResult.kt index 66bf66feb4..78d6158db9 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightResult.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightResult.kt @@ -4,6 +4,10 @@ fun TrafficLightResult.currentRoadTrafficLight(): TrafficLightStatus? { return TrafficLightStatusHelper.getCurrentRoadTrafficLight(this) } +fun TrafficLightResult.currentRoadIsRight():Boolean{ + return TrafficLightStatusHelper.currentRoadIsRight(this) +} + /** * 路口红绿灯请求返回数据 */ diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightStatusHelper.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightStatusHelper.kt index 56214d173d..3b6f9ac6ef 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightStatusHelper.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/trafficlight/TrafficLightStatusHelper.kt @@ -16,5 +16,10 @@ object TrafficLightStatusHelper { return null } + fun currentRoadIsRight(trafficLightResult: TrafficLightResult) : Boolean{ + val arrowNo = trafficLightResult.arrowNo + return RoadArrow.isOnlyRight(arrowNo) + } + } \ No newline at end of file From 81924e176cd8190b84c293bb383adf12342e641c Mon Sep 17 00:00:00 2001 From: lianglihui Date: Thu, 2 Dec 2021 12:05:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=99=90=E9=80=9F=E9=A2=84=E8=AD=A6=20?= =?UTF-8?q?=E9=99=90=E9=80=9F=E5=80=BC=E4=BB=8E=E9=AB=98=E7=B2=BE=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E8=8E=B7=E5=8F=96=20=E4=B8=94=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiver/ObuRsuTestTriggerReceiver.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt index ea7df77545..654d930274 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt @@ -65,16 +65,16 @@ class ObuRsuTestTriggerReceiver : BroadcastReceiver() { .onCvxIvpThreatIndInfo(cvxIvpThreatIndInfo) } - ObuConstants.USE_CASE_ID.SLW -> { //限速预警 - val cvxSlwThreatIndInfo = CvxSlwThreatIndInfo(1, 1, 1L) - val slwThreatExt = SlwThreatExt(1, 2, 6000, 2000) - - cvxSlwThreatIndInfo.ext_info = slwThreatExt - cvxSlwThreatIndInfo.status = obuStatus - - MogoPrivateObuManager.INSTANCE.getMogoObuListener() - .onCvxSlwThreatIndInfo(cvxSlwThreatIndInfo) - } +// ObuConstants.USE_CASE_ID.SLW -> { //限速预警 +// val cvxSlwThreatIndInfo = CvxSlwThreatIndInfo(1, 1, 1L) +// val slwThreatExt = SlwThreatExt(1, 2, 6000, 2000) +// +// cvxSlwThreatIndInfo.ext_info = slwThreatExt +// cvxSlwThreatIndInfo.status = obuStatus +// +// MogoPrivateObuManager.INSTANCE.getMogoObuListener() +// .onCvxSlwThreatIndInfo(cvxSlwThreatIndInfo) +// } //弱势交通参与者碰撞预警,行人/摩托车碰撞预警 ObuConstants.USE_CASE_ID.VRUCW -> { From d27d65433488da8127db8d1750b4a7f874513ab1 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Thu, 2 Dec 2021 16:57:30 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[Fix]=E5=8E=BB=E6=8E=89=E7=BA=A2=E7=BB=BF?= =?UTF-8?q?=E7=81=AF=E8=AF=AF=E5=B7=AE=E6=97=B6=E9=97=B4=E7=9A=84=E8=BF=87?= =?UTF-8?q?=E6=B8=A1=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redlightwarning/RedLightWarningManager.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 964be8caf0..d8d1f500ba 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 @@ -115,13 +115,13 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, when { trafficLightStatus.isRed() -> { Logger.d(TAG, "=====当前为红灯=====") - // 到达路口时红灯还没走完(由于多个数据有偏差，红灯预警延长1s，绿灯提示延长3s，多报出错不如少报且准) + // 到达路口时红灯还没走完(由于多个数据有偏差，红灯预警延长1s，绿灯提示条件延长1.5s，多报出错不如少报且准) if (arriveTime <= remainTime + 1) { redLightWarning() - } else if (arriveTime > remainTime + trafficLightResult.flashYellow + 3) {// 到达时红、黄灯都走完 + } else if (arriveTime > remainTime + trafficLightResult.flashYellow + 1.5) {// 到达时红、黄灯都走完 // 单位Km/h，当前为红灯，推荐速度越慢越容易绿灯通过，且要满足[10,50] val originRemainSpeed = - floor(distance / (remainTime + trafficLightResult.flashYellow + 3) * 3.6).toInt() + floor(distance / (remainTime + trafficLightResult.flashYellow + 1.5) * 3.6).toInt() when { originRemainSpeed > 50 -> greenLightWarning("10到50") originRemainSpeed in 10..50 -> greenLightWarning("10到$originRemainSpeed") @@ -130,12 +130,12 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, } trafficLightStatus.isYellow() -> { Logger.d(TAG, "=====当前为黄灯=====") - // 到达路口时黄灯还没走完(由于多个数据有偏差，红灯预警延长1s，绿灯提示延长3s，多报出错不如少报且准) + // 到达路口时黄灯还没走完(由于多个数据有偏差，红灯预警延长1s，绿灯提示延长1.5s，多报出错不如少报且准) if (arriveTime <= remainTime + 1) { redLightWarning() - } else if (arriveTime > remainTime + 3) { + } else if (arriveTime > remainTime + 1.5) { // 单位Km/h，当前为黄灯，推荐速度越慢越容易绿灯通过，且要满足[10,50] - val originRemainSpeed = floor(distance / (remainTime + 3) * 3.6).toInt() + val originRemainSpeed = floor(distance / (remainTime + 1.5) * 3.6).toInt() when { originRemainSpeed > 50 -> greenLightWarning("10到50") originRemainSpeed in 10..50 -> greenLightWarning("10到$originRemainSpeed") @@ -147,9 +147,9 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener, // 到达路口时绿灯已经走完(由于多个数据有偏差，多报出错不如少报且准，绿灯时间减少一点) if (arriveTime >= remainTime - 1) { redLightWarning() - } else if (arriveTime < remainTime - 3) { + } else if (arriveTime < remainTime - 1.5) { // 单位Km/h，当前为绿灯，推荐速度越快越容易绿灯通过，且要满足[10,50] - val originRemainSpeed = ceil(distance / (remainTime - 3) * 3.6).toInt() + val originRemainSpeed = ceil(distance / (remainTime - 1.5) * 3.6).toInt() when { originRemainSpeed < 10 -> greenLightWarning("10到50") originRemainSpeed in 10..50 -> greenLightWarning("${originRemainSpeed}到50") From 4d0e57a25626a5939ad0331845f55fce7bd7ad49 Mon Sep 17 00:00:00 2001 From: lianglihui Date: Thu, 2 Dec 2021 17:56:01 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=99=90=E9=80=9F=E9=A2=84=E8=AD=A6=20?= =?UTF-8?q?=E9=99=90=E9=80=9F=E5=80=BC=E4=BB=8E=E9=AB=98=E7=B2=BE=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E8=8E=B7=E5=8F=96=20=E4=B8=94=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../obu/mogo/MogoPrivateObuManager.kt | 45 ++++++++++--------- .../receiver/ObuRsuTestTriggerReceiver.kt | 20 ++++----- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt index 298f21b037..cb5619e798 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt @@ -458,28 +458,29 @@ class MogoPrivateObuManager private constructor() { // (5) 限速预警信息：CVX_SLW_THREAT_IND override fun onCvxSlwThreatIndInfo(info: CvxSlwThreatIndInfo?) { - Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxSlwThreatIndInfo ------> $info") - if (info != null) { - when (info.status) { - // 添加 - ObuConstants.STATUS.ADD, - ObuConstants.STATUS.UPDATE - -> { - if (info.ext_info != null) { - // 计算为千米每小时 TODO 这里需要做一下向上取整数，40，60，80，120等 - Logger.d( - MogoObuConst.TAG_MOGO_OBU, - "info.ext_info.speed_limit_max ------> ${info.ext_info.speed_limit_max}" - ) - CallerHmiManager.showLimitingVelocity((Math.round(((info.ext_info.speed_limit_max * 60 * 60) / 1000) / 10) * 10).toInt()) - } - } - // 删除 - ObuConstants.STATUS.DELETE -> { - CallerHmiManager.disableLimitingVelocity() - } - } - } + //todo 限速走高精地图 屏蔽OBU限速\ +// Logger.d(MogoObuConst.TAG_MOGO_OBU, "onCvxSlwThreatIndInfo ------> $info") +// if (info != null) { +// when (info.status) { +// // 添加 +// ObuConstants.STATUS.ADD, +// ObuConstants.STATUS.UPDATE +// -> { +// if (info.ext_info != null) { +// // 计算为千米每小时 TODO 这里需要做一下向上取整数，40，60，80，120等 +// Logger.d( +// MogoObuConst.TAG_MOGO_OBU, +// "info.ext_info.speed_limit_max ------> ${info.ext_info.speed_limit_max}" +// ) +// CallerHmiManager.showLimitingVelocity((Math.round(((info.ext_info.speed_limit_max * 60 * 60) / 1000) / 10) * 10).toInt()) +// } +// } +// // 删除 +// ObuConstants.STATUS.DELETE -> { +// CallerHmiManager.disableLimitingVelocity() +// } +// } +// } } diff --git a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt index 654d930274..ea7df77545 100644 --- a/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt +++ b/core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/receiver/ObuRsuTestTriggerReceiver.kt @@ -65,16 +65,16 @@ class ObuRsuTestTriggerReceiver : BroadcastReceiver() { .onCvxIvpThreatIndInfo(cvxIvpThreatIndInfo) } -// ObuConstants.USE_CASE_ID.SLW -> { //限速预警 -// val cvxSlwThreatIndInfo = CvxSlwThreatIndInfo(1, 1, 1L) -// val slwThreatExt = SlwThreatExt(1, 2, 6000, 2000) -// -// cvxSlwThreatIndInfo.ext_info = slwThreatExt -// cvxSlwThreatIndInfo.status = obuStatus -// -// MogoPrivateObuManager.INSTANCE.getMogoObuListener() -// .onCvxSlwThreatIndInfo(cvxSlwThreatIndInfo) -// } + ObuConstants.USE_CASE_ID.SLW -> { //限速预警 + val cvxSlwThreatIndInfo = CvxSlwThreatIndInfo(1, 1, 1L) + val slwThreatExt = SlwThreatExt(1, 2, 6000, 2000) + + cvxSlwThreatIndInfo.ext_info = slwThreatExt + cvxSlwThreatIndInfo.status = obuStatus + + MogoPrivateObuManager.INSTANCE.getMogoObuListener() + .onCvxSlwThreatIndInfo(cvxSlwThreatIndInfo) + } //弱势交通参与者碰撞预警,行人/摩托车碰撞预警 ObuConstants.USE_CASE_ID.VRUCW -> { From c6afbd7b34084dd371b43f66688cf3a8a9ce264c Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 3 Dec 2021 13:48:12 +0800 Subject: [PATCH 6/6] fix bug of call --- .../com/mogo/module/carchatting/biz/CallChatCenter.kt | 8 +++++--- .../com/mogo/module/carchatting/biz/CallChatManager.kt | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatCenter.kt b/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatCenter.kt index 312cec37a1..34e82dd245 100644 --- a/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatCenter.kt +++ b/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatCenter.kt @@ -493,15 +493,17 @@ class CallChatCenter private constructor() : IBizCallChat.IBizCallBack, IVoiceCo * 2.如果当前正在打电话中，则拒绝 */ override fun showIncomingCall(userInfo: UserInfo) { + Logger.d(TAG, "showIncomingCall===userInfo: $userInfo") + currentUserInfo = userInfo if (callChatManager.isCalling() || callingWindowManager.isIncomingWindowShow()) { log(TAG, "已在通话进程中，准备拒绝他 ---> ") refuseCall(userInfo.sn) } else { - log(TAG, "有人打来电话，准备显示 ---> ${UserInfoHelper.currentRoomId}") + log(TAG, "有人打来电话，准备显示 房间号---> ${UserInfoHelper.currentRoomId} , 用户---> ${currentUserInfo!!.sn}") callingWindowManager.showIncomingView({ - callChatManager.answerInvoke(userInfo.sn) + callChatManager.answerInvoke(currentUserInfo!!.sn) }, { - refuseCall(userInfo.sn) + refuseCall(currentUserInfo!!.sn) }) } } diff --git a/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatManager.kt b/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatManager.kt index 935fdb405e..af1dbb64bc 100644 --- a/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatManager.kt +++ b/modules/mogo-module-carchatting/src/main/java/com/mogo/module/carchatting/biz/CallChatManager.kt @@ -155,7 +155,7 @@ class CallChatManager(iBizCallChat: IBizCallChat.IBizCallBack) : ICallResponse { } fun answerInvoke(sn: String) { - Logger.i(TAG, "answerInvoke") + Logger.i(TAG, "answerInvoke sn : $sn") IMCallManager.answer(sn, this) }