From 1de61acdd250ece778f25fde4848052ca6d74315 Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 18 Oct 2022 16:24:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E7=BA=BF=E7=A8=8B=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d8d7879729..7bcdb6b808 100644 --- a/gradle.properties +++ b/gradle.properties @@ -175,4 +175,4 @@ ADAS_DATA_LIB_CHILD_VERSION=.0 # 线程优化版本 -THREAD_OPT_VERSION=3.0.0 +THREAD_OPT_VERSION=3.0.1 From 3879bcde7ca859b1084c28de7e15d56987ec77c7 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 18 Oct 2022 16:51:21 +0800 Subject: [PATCH 2/5] reset traffic light control api --- .../v2x/trafficlight/network/TrafficLightNetWorkModel.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt index fc566852bc..f9a30eeb9a 100644 --- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt +++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/network/TrafficLightNetWorkModel.kt @@ -120,8 +120,7 @@ class TrafficLightNetWorkModel { } loader { apiCall { - MoGoRetrofitFactory.getInstanceNoCallAdapter("http://dzt-qa-city.zhidaozhixing.com") - .create(TrafficLightApiService::class.java).changeLight(map) + getNetWorkApi().changeLight(map) } } onSuccess { From c9bd42373d2f2b33a7dc5811a8fc6cc816c0548a Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 18 Oct 2022 19:04:55 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[2.11.0=20fix]=20bus=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E8=A7=A3=E5=86=B3Map280=E7=89=88=E6=9C=AC=E5=88=B0?= =?UTF-8?q?=E7=AB=99=E8=BF=94=E5=9B=9E=E5=AF=86=E9=9B=86=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E7=AB=99=E6=BB=91=E5=8A=A8=E5=87=BA=E5=8F=91=E7=AB=8B=E9=A9=AC?= =?UTF-8?q?=E5=88=B0=E7=AB=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/model/BusOrderModel.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index 4e9f1e8fb4..ab7446e7a4 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -858,7 +858,23 @@ public class BusOrderModel { if (isArrivedStation) return; isArrivedStation = true; - CallerLogger.INSTANCE.d( M_BUS + TAG, "行程日志-到站==backgroundCurrentStationIndex=" + backgroundCurrentStationIndex); + //MAP 280 每隔100ms左右返回一次到站， 导致在到达中间站后再次滑动出发后会有时间差，收到一次到站，出现问题 + //此处比对 自驾告诉的到站站点坐标和本地应到站站点坐标， 一致时才能到站 + if (data != null && data.getEndLocation() != null){ + double latitude = data.getEndLocation().getLatitude(); //wgs + double longitude = data.getEndLocation().getLongitude(); + int arrivedStationIndex = backgroundCurrentStationIndex + 1; + BusStationBean arriveStation = stationList.get(arrivedStationIndex); + if (Double.doubleToLongBits(latitude) != Double.doubleToLongBits(arriveStation.getLat()) + || Double.doubleToLongBits(longitude) != Double.doubleToLongBits(arriveStation.getLon())){ + CallerLogger.INSTANCE.e( M_BUS + TAG, "行程日志-到站拦截,到站坐标不一致" ); + return; + } + } + + CallerLogger.INSTANCE.d( M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + + backgroundCurrentStationIndex); + isGoingToNextStation = false; arriveSiteStation(); From bd33717c109d623896c2ab013f16b2c250a6589f Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 18 Oct 2022 19:06:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[2.11.0=20fix]=20bus=E5=8F=B8=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E8=A7=A3=E5=86=B3Map280=E7=89=88=E6=9C=AC=E5=88=B0?= =?UTF-8?q?=E7=AB=99=E8=BF=94=E5=9B=9E=E5=AF=86=E9=9B=86=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E7=AB=99=E6=BB=91=E5=8A=A8=E5=87=BA=E5=8F=91=E7=AB=8B=E9=A9=AC?= =?UTF-8?q?=E5=88=B0=E7=AB=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mogo/och/bus/model/BusOrderModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index ab7446e7a4..04cbb1573a 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -855,9 +855,6 @@ public class BusOrderModel { return; } - if (isArrivedStation) return; - isArrivedStation = true; - //MAP 280 每隔100ms左右返回一次到站， 导致在到达中间站后再次滑动出发后会有时间差，收到一次到站，出现问题 //此处比对 自驾告诉的到站站点坐标和本地应到站站点坐标， 一致时才能到站 if (data != null && data.getEndLocation() != null){ @@ -872,6 +869,9 @@ public class BusOrderModel { } } + if (isArrivedStation) return; + isArrivedStation = true; + CallerLogger.INSTANCE.d( M_BUS + TAG, "行程日志-当前==backgroundCurrentStationIndex=" + backgroundCurrentStationIndex); From 49570aab234d6aabf2138e3543bf5e3122ef1706 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 18 Oct 2022 19:11:14 +0800 Subject: [PATCH 5/5] :new: add func of biz config in 2.11.0 --- .../funcconfig/FuncConfigConst.kt | 2 ++ .../com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt | 4 ++++ .../com/mogo/eagle/core/data/deva/bizconfig/FuncBizConfig.kt | 1 + 3 files changed, 7 insertions(+) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt index 09fb1766d2..9b2fd420b0 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/funcconfig/FuncConfigConst.kt @@ -20,6 +20,7 @@ import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_LCW import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_LIMIT_SPEED_SET import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_LTA import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_OPT_LINE +import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_PNC_ACTIONS import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RAIN_MODE import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_RTS import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_SLW @@ -88,6 +89,7 @@ class FuncConfigConst { foundationSubList.add(SubBiz(BIZ_LIMIT_SPEED_SET, lock = false, state = true, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_BYPASS, lock = false, state = true, dependNode = "", data = "")) foundationSubList.add(SubBiz(BIZ_AUTOPILOT_LANE_SELECTION, lock = false, state = true, dependNode = "", data = "")) + foundationSubList.add(SubBiz(BIZ_PNC_ACTIONS, lock = false, state = true, dependNode = "", data = "")) businessList.add(Business(FOUNDATION,foundationSubList)) return FuncConfig(0, AppUtils.getAppVersionCode(), getChannelCode(), getEnv(), businessList) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt index 1d756041cf..539658cf16 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/pnc/PncActionsView.kt @@ -7,6 +7,8 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import com.mogo.eagle.core.data.autopilot.AutopilotStatusInfo import com.mogo.eagle.core.data.autopilot.pnc.PncActionsHelper +import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_PNC_ACTIONS +import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.FOUNDATION import com.mogo.eagle.core.data.trafficlight.TrafficLightResult import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight import com.mogo.eagle.core.data.trafficlight.isRed @@ -19,6 +21,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningAction import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager 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 mogo.telematics.pad.MessagePad @@ -67,6 +70,7 @@ class PncActionsView @JvmOverloads constructor( } } + @BizConfig(FOUNDATION, "", BIZ_PNC_ACTIONS) override fun pncActions(planningActionMsg: MessagePad.PlanningActionMsg) { mAutoPilotStatusInfo?.let { if (it.state == STATUS_AUTOPILOT_RUNNING) { diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bizconfig/FuncBizConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bizconfig/FuncBizConfig.kt index d0fd9538fa..096e6923ed 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bizconfig/FuncBizConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/bizconfig/FuncBizConfig.kt @@ -40,6 +40,7 @@ class FuncBizConfig { const val BIZ_LIMIT_SPEED_SET = "BIZ_LIMIT_SPEED_SET" // 限速设置 todo 暂未有场景，未实现 const val BIZ_BYPASS = "BIZ_BYPASS" // 绕障 todo 暂未实现 const val BIZ_AUTOPILOT_LANE_SELECTION = "BIZ_AUTOPILOT_LANE_SELECTION" // 择机变道 todo 暂未实现 + const val BIZ_PNC_ACTIONS = "BIZ_PNC_ACTIONS" // PNC行为决策 } } \ No newline at end of file