From 66dfc6b21615e3f05e0e7a729ad0818e5a0e0750 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Sat, 2 Apr 2022 13:05:01 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=8CChange=E3=80=8D=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=8C=E5=B7=A5=E5=85=B7=E9=9D=A2=E6=9D=BF=E3=80=8D?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8F=8A=E6=97=B6=E7=A7=BB=E9=99=A4=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../core/function/hmi/ui/tools/AutoPilotAndCheckView.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 5faa68193b..472ab73e41 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 @@ -54,7 +54,6 @@ class AutoPilotAndCheckView @JvmOverloads constructor( @SuppressLint("ClickableViewAccessibility") private fun initView() { background = ColorDrawable(Color.parseColor("#F0151D41")) - CallerAutopilotCarConfigListenerManager.addListener(TAG, this) if (keyBoardUtil == null) { keyBoardUtil = KeyBoardUtil(sKeyBoardView, etInputSpeed) } @@ -182,11 +181,13 @@ class AutoPilotAndCheckView @JvmOverloads constructor( override fun onAttachedToWindow() { super.onAttachedToWindow() CallerAutoPilotStatusListenerManager.addListener(TAG, this) + CallerAutopilotCarConfigListenerManager.addListener(TAG, this) } override fun onDetachedFromWindow() { super.onDetachedFromWindow() CallerAutoPilotStatusListenerManager.removeListener(TAG) + CallerAutopilotCarConfigListenerManager.removeListener(TAG) } override fun onAutopilotStatusResponse(autoPilotStatusInfo: AutopilotStatusInfo) { @@ -202,8 +203,10 @@ class AutoPilotAndCheckView @JvmOverloads constructor( override fun onAutopilotCarConfig(carConfigResp: MessagePad.CarConfigResp) { UiThreadHandler.post { - tvAcceleration.text = "加速度 ${carConfigResp.maxAcceleration} m/s²" - etInputSpeed.setText((carConfigResp.speedLimit * 3.6).toInt().toString()) + tvAcceleration?.let { + tvAcceleration.text = "加速度 ${carConfigResp.maxAcceleration} m/s²" + etInputSpeed.setText((carConfigResp.speedLimit * 3.6).toInt().toString()) + } } } } \ No newline at end of file From 0ea23d080b3ab595fa0f80499751afef2c233413 Mon Sep 17 00:00:00 2001 From: xuxinchao <13522809046@163.com> Date: Sat, 2 Apr 2022 13:49:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=AA=97=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主线程更新UI --- .../core/function/hmi/ui/setting/DebugSettingView.kt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 8b31a4fad9..620abff3e3 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 @@ -1630,7 +1630,9 @@ class DebugSettingView @JvmOverloads constructor( * 时延显示 */ override fun onObuV2iDelayTime(delayTime: Long) { - tvObuDelay.text = "obu时延：" + delayTime.toString() + ThreadUtils.runOnUiThread{ + tvObuDelay.text = "obu时延：" + delayTime.toString() + } } /** @@ -1654,7 +1656,9 @@ class DebugSettingView @JvmOverloads constructor( * @param steering 方向盘转向角 */ override fun onAutopilotSteeringData(steering: Float) { - tvSteeringInfo.text = "方向盘转向角：${steering}" + ThreadUtils.runOnUiThread{ + tvSteeringInfo.text = "方向盘转向角：${steering}" + } } /** @@ -1662,7 +1666,9 @@ class DebugSettingView @JvmOverloads constructor( * @param gear 档位 */ override fun onAutopilotGearData(gear: Chassis.GearPosition) { - tvGearInfo.text = "挂挡档位：${gear}" + ThreadUtils.runOnUiThread{ + tvGearInfo.text = "挂挡档位：${gear}" + } } /** From d6c711117f8143eb460584bea18a1a095ea65641 Mon Sep 17 00:00:00 2001 From: renwj Date: Sat, 2 Apr 2022 14:40:28 +0800 Subject: [PATCH 3/7] =?UTF-8?q?[V2X]=E7=A7=BB=E9=99=A4=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9A=84V2X=E7=B1=BB=E5=9E=8BToast=E6=8F=90=E7=A4=BA,?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=9B=B8=E5=85=B3=E6=97=A5=E5=BF=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BE=BF=E4=BA=8E=E5=AE=9A=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/v2x/events/scenario/impl/V2XScenarioManager.java | 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/events/scenario/impl/V2XScenarioManager.java b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java index f984e65944..226a7043d8 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-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/scenario/impl/V2XScenarioManager.java @@ -86,8 +86,7 @@ public class V2XScenarioManager implements IV2XScenarioManager { break; default: mV2XScenario = null; - CallerLogger.INSTANCE.e(M_V2X + TAG, "当前V2X消息类型未定义。"); - TipToast.tip("当前V2X消息类型未定义"); + CallerLogger.INSTANCE.e(M_V2X + TAG, "当前V2X消息类型未定义:" + v2XMessageEntity); return; } // 展示最新的消息 From 0f4529485a23817f50f768676ac5f3774d4d2643 Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Sat, 2 Apr 2022 14:46:11 +0800 Subject: [PATCH 4/7] fixed bug --- .../function/obu/mogo/MogoPrivateObuManager.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 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 b72a559f31..cd081f308f 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 @@ -533,12 +533,15 @@ class MogoPrivateObuManager private constructor() { val appId = info.threat_info.app_id val level = info.threat_info.threat_level val status = info.status - CallerLogger.d( - "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", - "onCvxV2vThreatIndInfo target_classification = ${ - getMessageDirection(info.ext_info.target_classification) - } --- direction = $direction --- appId = $appId ---level = $level -- status = $status" - ) + if (info.ext_info != null) { + CallerLogger.d( + "$M_OBU${MogoObuConst.TAG_MOGO_OBU}", + "onCvxV2vThreatIndInfo target_classification = ${ + getMessageDirection(info.ext_info.target_classification) + } --- direction = $direction --- appId = $appId ---level = $level -- status = $status" + ) + } + handleSdkObu(appId, direction, status, level, info) } } From 29d9a7905b972a8be2fc2b87dffc3fec96ab955f Mon Sep 17 00:00:00 2001 From: pangfan Date: Sat, 2 Apr 2022 14:53:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?[Bus/Taxi=20d=202.6.5]1.=E4=BC=98=E5=8C=96t?= =?UTF-8?q?axi=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81enum=EF=BC=9B2.=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE->2.0.9.11=EF=BC=88=E8=A7=A3=E5=86=B3=E8=87=AA?= =?UTF-8?q?=E8=BD=A6=E6=A8=A1=E5=9E=8B=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=89=EF=BC=9B3.version->2.6.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/TaxiPassengerOrderStatusEnum.kt | 10 +++--- .../passenger/model/TaxiPassengerModel.java | 8 ++--- .../presenter/BaseTaxiPassengerPresenter.java | 10 ++---- .../TaxiPassengerServingOrderPresenter.java | 10 ++---- .../ui/TaxiPassengerServingOrderFragment.java | 8 ++--- .../mogo/och/taxi/constant/OrderStatusEnum.kt | 10 +++--- .../och/taxi/model/MogoOCHTaxiModelNew.java | 33 +++++++++---------- .../och/taxi/presenter/OCHTaxiPresenter.java | 4 +-- .../ui/OCHTaxiBeingServerdOrdersFragment.java | 18 +++++----- .../com/mogo/och/taxi/ui/OCHTaxiFragment.java | 7 ++-- .../och/taxi/ui/OCHTaxiOrderCancelDialog.java | 8 ++--- gradle.properties | 6 ++-- 12 files changed, 58 insertions(+), 74 deletions(-) diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt index eac42d045d..1e3ec5ccd0 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerOrderStatusEnum.kt @@ -25,11 +25,11 @@ package com.mogo.och.taxi.passenger.constant */ enum class TaxiPassengerOrderStatusEnum(val code: Int) { None( 0 ), - OnTheWayToStartStation( 10), - ArriveAtStartStation( 20), - UserArriveAtStartStation( 30), - OnTheWayToEndStation( 40), - ArriveAtEndStation( 50), + OnTheWayToStart( 10), + ArriveAtStart( 20), + UserArriveAtStart( 30), + OnTheWayToEnd( 40), + ArriveAtEnd( 50), JourneyCompleted(60),//行程完成 Cancel( 70); 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 2579d0b312..4b10e44624 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 @@ -46,7 +46,6 @@ import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceCallback; import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager; import com.mogo.aicloud.services.socket.IMogoLifecycleListener; import com.mogo.och.taxi.passenger.utils.TPCoordinateCalculateRouteUtil; -import com.mogo.service.IMogoServiceApis; import com.mogo.service.intent.IMogoIntentListener; import com.mogo.service.statusmanager.IMogoStatusChangedListener; import com.mogo.service.statusmanager.StatusDescriptor; @@ -242,6 +241,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback CallerAutoPilotStatusListenerManager.INSTANCE.removeListener(mGoAutopilotStatusListener); CallerAutopilotPlanningListenerManager.INSTANCE.removeListener(moGoAutopilotPlanningListener); + CallLimitingVelocityListenerManager.INSTANCE.removeListener(limitingVelocityListener); } private void startOrStopOrderLoop(boolean start) { @@ -465,7 +465,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback public void onCarLocationChanged2( Location location ) { //位置变化时，通过围栏判断是否到达x点 if (location != null && checkCurrentOCHOrder()) { - if (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.OnTheWayToEndStation) { + if (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.OnTheWayToEnd) { calculateTravelDistance(location); } } @@ -494,7 +494,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback if (state == IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) { if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning(); if (mCurrentOCHOrder != null - && getCurOrderStatus() == TaxiPassengerOrderStatusEnum.ArriveAtStartStation + && getCurOrderStatus() == TaxiPassengerOrderStatusEnum.ArriveAtStart && state != mPrevAPStatus) { // 当高频返回autopilot 2时，不重复调用订单状态变更 mPrevAPStatus = state; // 每个状态单独赋值，解决无订单时已经是2的状态导致的新订单来时无法进入此逻辑更新状态 @@ -544,7 +544,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback } if (arrivalNotification == null || !checkCurrentOCHOrder() - || (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.ArriveAtEndStation)) { + || (getCurOrderStatus() == TaxiPassengerOrderStatusEnum.ArriveAtEnd)) { return; } if (DebugConfig.isDebug()) { 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 7cadee404a..3b670315d9 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 @@ -10,18 +10,14 @@ import androidx.lifecycle.LifecycleOwner; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.mvp.Presenter; -import com.mogo.commons.voice.AIAssist; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.network.utils.GsonUtil; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; -import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr; import com.mogo.eagle.core.utilcode.util.UiThreadHandler; -import com.mogo.och.taxi.passenger.R; import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrderQueryRespBean; import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerADASStatusCallback; import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerControllerStatusCallback; import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback; -import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst; import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum; import com.mogo.och.taxi.passenger.model.TaxiPassengerModel; import com.mogo.och.taxi.passenger.model.TaxiPassengerNaviToDestinationModel; @@ -149,12 +145,12 @@ public class BaseTaxiPassengerPresenter extends Presenter implements IOCH @Override public void onCurrentOrderStatusChanged(OrderQueryRespBean.Result order) { CallerLogger.INSTANCE.d(M_TAXI + TAG,"order = "+order.toString()); - if (OrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus){ + if (OrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus){ MogoOCHTaxiModelNew.getInstance().startDynamicCalculateRouteInfo(); } - if (OrderStatusEnum.ArriveAtEndStation.getCode() == order.orderStatus || + if (OrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus || OrderStatusEnum.Cancel.getCode() == order.orderStatus || OrderStatusEnum.JourneyCompleted.getCode() == order.orderStatus){ MogoOCHTaxiModelNew.getInstance().startOrStopCalculateRouteInfo(false); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java index 5eee71e8eb..173329228d 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiBeingServerdOrdersFragment.java @@ -159,7 +159,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem } mOrderNo = order.orderNo; onOrderStatusChanged(order); - if (OrderStatusEnum.ArriveAtEndStation.getCode() == order.orderStatus) { + if (OrderStatusEnum.ArriveAtEnd.getCode() == order.orderStatus) { mTaxiFragment.queryCurOrderRouteInfo(); mContentModule3.setVisibility(View.GONE); mContentModule2.setVisibility(View.VISIBLE); @@ -177,7 +177,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem // String strHtml2 = "距离 " + "- -" + " 公里，" // + "用时 " + "- -" + " 分钟"; // mDistanceAndTime.setText(Html.fromHtml(strHtml2)); - } else if (OrderStatusEnum.OnTheWayToEndStation.getCode() == order.orderStatus) { + } else if (OrderStatusEnum.OnTheWayToEnd.getCode() == order.orderStatus) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经去往终点"); mContentModule3.setVisibility(View.GONE); mContentModule2.setVisibility(View.VISIBLE); @@ -190,7 +190,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem mTitleTV2.setText("送乘客至"); mStationTv2.setText(order.endSiteAddr); - } else if (OrderStatusEnum.ArriveAtStartStation.getCode() == order.orderStatus) { + } else if (OrderStatusEnum.ArriveAtStart.getCode() == order.orderStatus) { CallerLogger.INSTANCE.d(M_TAXI + TAG, "已经达到起点"); mContentModule2.setVisibility(View.GONE); mContentModule3.setVisibility(View.VISIBLE); @@ -378,7 +378,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem if (status != saveOrderState) { OrderStatusEnum ochStatus = OrderStatusEnum.valueOf(status); switch (ochStatus) { - case OnTheWayToStartStation: + case OnTheWayToStart: mOrderCancel.setVisibility(View.VISIBLE); showNotice(mActivity.getString(R.string.module_och_taxi_new_order)); mTtsLessThan200Tip = 0; @@ -396,7 +396,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); setOrRemoveMapMaker(false,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; - case ArriveAtStartStation: + case ArriveAtStart: mTtsLessThan200Tip = 0; mOrderCancel.setVisibility(View.VISIBLE); showNotice(mActivity.getString(R.string.module_och_taxi_order_status_ph_text)); @@ -404,14 +404,14 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem setOrRemoveMapMaker(true, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; - case OnTheWayToEndStation: + case OnTheWayToEnd: // showNotice("欢迎使用蘑菇智行"); mOrderCancel.setVisibility(View.VISIBLE); showOrHideNavi(false); setOrRemoveMapMaker(false, OCHTaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint); setOrRemoveMapMaker(true,OCHTaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint); break; - case ArriveAtEndStation: + case ArriveAtEnd: mCurrentOrder = null; mTtsLessThan200Tip = 0; mOrderCancel.setVisibility(View.GONE); @@ -528,7 +528,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem UiThreadHandler.postDelayed(new Runnable() { @Override public void run() { - if (saveOrderState == OrderStatusEnum.OnTheWayToStartStation.getCode()) { + if (saveOrderState == OrderStatusEnum.OnTheWayToStart.getCode()) { startNaviToStartStation(false, mOrderStartStationLat, mOrderStartStationLng); } } @@ -536,7 +536,7 @@ public class OCHTaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implem UiThreadHandler.postDelayed(new Runnable() { @Override public void run() { - if (saveOrderState == OrderStatusEnum.OnTheWayToStartStation.getCode()) { + if (saveOrderState == OrderStatusEnum.OnTheWayToStart.getCode()) { if (mNaviIcon.getVisibility() == View.GONE) { mNaviIcon.setVisibility(View.VISIBLE); } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index a26ad569f5..efda226b61 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -2,7 +2,6 @@ package com.mogo.och.taxi.ui; import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_TAXI; -import android.content.Context; import android.os.Build; import android.os.Bundle; import android.text.TextUtils; @@ -13,8 +12,6 @@ import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; import androidx.fragment.app.FragmentTransaction; -import com.amap.api.maps.CoordinateConverter; -import com.amap.api.maps.model.LatLng; import com.mogo.commons.debug.DebugConfig; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.module.common.MogoApisHandler; @@ -69,7 +66,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment Date: Sat, 2 Apr 2022 14:50:17 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=88=A4=E7=A9=BA=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/notice/NoticeTrafficDialog.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java index d381f12080..fb1058fcbc 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java @@ -169,17 +169,19 @@ public class NoticeTrafficDialog extends BaseFloatDialog implements LifecycleObs * 开启自动驾驶 */ private void startAutoPilot() { - AutopilotControlParameters parameters = new AutopilotControlParameters(); - parameters.isSpeakVoice = false; - parameters.vehicleType = 10; - //云平台使用的是火星坐标,自动驾驶需要wgs84 - double[] gcj02 = CoordinateUtils.transformGcj02toWgs84(mTrafficStyleInfo.getLat(), mTrafficStyleInfo.getLon()); - parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat - (CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(), - CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon()); - parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat - (gcj02[0], gcj02[1]); - CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters); + if (mTrafficStyleInfo != null){ + AutopilotControlParameters parameters = new AutopilotControlParameters(); + parameters.isSpeakVoice = false; + parameters.vehicleType = 10; + //云平台使用的是火星坐标,自动驾驶需要wgs84 + double[] gcj02 = CoordinateUtils.transformGcj02toWgs84(mTrafficStyleInfo.getLat(), mTrafficStyleInfo.getLon()); + parameters.startLatLon = new AutopilotControlParameters.AutoPilotLonLat + (CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lat(), + CallerAutoPilotStatusListenerManager.INSTANCE.getCurWgs84Lon()); + parameters.endLatLon = new AutopilotControlParameters.AutoPilotLonLat + (gcj02[0], gcj02[1]); + CallerAutoPilotManager.INSTANCE.startAutoPilot(parameters); + } } /** From 126905b2571a6557d7509477f2bc8a98852a213f Mon Sep 17 00:00:00 2001 From: donghongyu Date: Sat, 2 Apr 2022 15:17:14 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=8CChange=E3=80=8D=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=8COCH=20=E5=B0=8F=E5=9C=B0=E5=9B=BE=E3=80=8D?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=A7=92=E5=BA=A6=E6=99=83=E5=8A=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../function/v2x/events/V2XEventManager.kt | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) 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 c804df39ca..795d4e6a15 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 @@ -336,7 +336,7 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb } private fun refreshCarState(location: MogoLocation) { - fixCarAngle(location) + V2XStatusManager.getInstance().location = location // 只有车速大于 5 的时候进行计算 if (location.speed < 5) return val v2xPolyline = BridgeApi.v2xPolyline()?.mogoPolyline @@ -422,32 +422,6 @@ object V2XEventManager : IMoGoMapLocationListener, IMoGoTokenCallback, IV2XCallb } } - private fun fixCarAngle(location: MogoLocation) { // 记录位置轨迹 - // 记录位置轨迹 - if (historyPath[0] != null) { - historyPath[1] = historyPath[0] - } - historyPath[0] = location - - if (historyPath[1] != null && historyPath[0] != null) { - val carAngle: Double = DrivingDirectionUtils.getCarAngle( - historyPath[1]!!.latitude, - historyPath[1]!!.longitude, - historyPath[0]!!.latitude, - historyPath[0]!!.longitude - ).toDouble() - - //CallerLogger.d("$M_V2X$TAG", - // "\n车辆经纬度：" + Arrays.toString(historyPath) + - // "\n车辆角度：" + carAngle); - // 这里是真实的车辆角度 - location.bearing = carAngle.toFloat() - } else { //CallerLogger.e("$M_V2X$TAG", - // "\n首次获取经纬度，默认车头朝北：" + Arrays.toString(historyPath)); - location.bearing = 0.0f - } - V2XStatusManager.getInstance().location = location - } override fun onTokenGot(token: String?, sn: String?) { if (V2XManager.hasInit()) {