From 9a06b0161a6f35b6bf7115635ceea192adeb9310 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 10 Apr 2023 10:28:35 +0800 Subject: [PATCH 1/6] =?UTF-8?q?[dev=5Frobobus-d=5F230322=5F3.0.0]=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=8A=A0=E5=85=A5=E6=B6=88=E6=81=AF=E7=9B=92=E5=AD=90?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/vehicle/TakeOverView.kt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt index 36185d7cd5..3039be9b70 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/vehicle/TakeOverView.kt @@ -68,6 +68,15 @@ class TakeOverView @JvmOverloads constructor( override fun onShow() { takeOver = true visibility = View.VISIBLE + //加入消息盒子 + saveMsgBox( + MsgBoxBean( + MsgBoxType.V2X, V2XMsg( + EventTypeEnumNew.TAKE_OVER_EVENT.poiType, + EventTypeEnumNew.TAKE_OVER_EVENT.poiTypeStrVr, "" + ) + ) + ) } override fun onDismiss() { @@ -76,16 +85,6 @@ class TakeOverView @JvmOverloads constructor( } } ) - //加入消息盒子 - saveMsgBox( - MsgBoxBean( - MsgBoxType.V2X, V2XMsg( - EventTypeEnumNew.TAKE_OVER_EVENT.poiType, - EventTypeEnumNew.TAKE_OVER_EVENT.poiTypeStrVr, "" - ) - ) - ) - } } } From e56ccecc40545b1868efa8401bffc0e30ed6e3a2 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 10 Apr 2023 11:27:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?[dev=5Frobobus-d=5F230322=5F3.0.0]=E4=BA=91?= =?UTF-8?q?=E8=B0=83=E5=BA=A6=E5=A2=9E=E5=8A=A0=E4=B8=8A=E6=8A=A5=E6=8E=A5?= =?UTF-8?q?=E6=9E=9C=E9=94=99=E8=AF=AF=E5=90=90=E5=8F=B8=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=BA=E4=B8=BA=E6=8E=A5=E7=AE=A1?= =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/biz/dispatch/DispatchAutoPilotManager.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt index 3a61b07d74..2ede158a50 100644 --- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt +++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/dispatch/DispatchAutoPilotManager.kt @@ -207,13 +207,13 @@ class DispatchAutoPilotManager private constructor() : fun affirm() { CallerHmiManager.dismissDispatchDialog() - receiverBean?.taskId?.let { + receiverBean?.taskId?.let { it -> dispatchServiceModel.dispatchResultUpload(DISPATCH_RESULT_AFFIRM, it, onSuccess = { //调用工控机开启自动驾驶 startAutoPilot() - },onError = { - + },onError = { error-> + ToastUtils.showShort("上报调度失败${error}") }) } } @@ -351,7 +351,9 @@ class DispatchAutoPilotManager private constructor() : MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_STEER, MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_GEAR_SWITCH, MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_CHASSIS_NO_RESPONSE, - MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_CHASSIS_UNKNOWN->{ + MogoReport.Code.Error.EMAP.EXIT_AUTOPILOT_FOR_CHASSIS_UNKNOWN, + "IRECORDER_TASK_AUTO"//自动录包任务创建 + ->{ //如果到达终点，则不处理 if(isArriveEnd){ return From 56ff6e1bc4c9aa271727de80f45679910da7da80 Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 10 Apr 2023 12:11:02 +0800 Subject: [PATCH 3/6] =?UTF-8?q?[dev=5Frobobus-d=5F230322=5F3.0.0]=E8=BD=A6?= =?UTF-8?q?=E9=80=9F=E8=AE=BE=E7=BD=AE=E5=85=89=E6=A0=87=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/tools/AutoPilotAndCheckView.kt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 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 e57ecb21de..e4d55ce80c 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 @@ -101,10 +101,14 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( override fun onUpdate(inputContent: String?) { if (inputContent != null) { try { - speedLimit = inputContent.toInt() - if(speedLimit>60){ - speedLimit = 60 - ToastUtils.showShort("最大限速60") + if(inputContent.isEmpty()){ + speedLimit = 0 + }else{ + speedLimit = inputContent.toInt() + if(speedLimit>60){ + speedLimit = 60 + ToastUtils.showShort("最大限速60") + } } }catch (t: Exception){ ToastUtils.showShort("最大限速60") @@ -112,6 +116,7 @@ internal class AutoPilotAndCheckView @JvmOverloads constructor( } etInputSpeed.setText(speedLimit.toString()) + etInputSpeed.setSelection(speedLimit.toString().length) } } From 9c0ba1f3b0f440322da98b362061667d2ea892a7 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 10 Apr 2023 15:30:36 +0800 Subject: [PATCH 4/6] =?UTF-8?q?[2.0.0]=20=E4=BF=AE=E5=A4=8D=E6=8E=A5?= =?UTF-8?q?=E9=A9=B3=E4=B9=98=E5=AE=A2=E5=B1=8F=E5=81=B6=E7=8E=B0=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E4=B8=8D=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/OchCommonLoginStatusDefaultModel.kt | 13 ++++------ .../mogo/och/data/bean/BusStationBean.java | 26 +++++++++++++++++++ .../passenger/model/BusPassengerModel.java | 3 ++- .../bus/passenger/model/PM2DrivingModel.kt | 5 ++-- .../src/m2/res/values/strings.xml | 2 +- .../com/mogo/och/bus/model/OrderModel.java | 2 +- 6 files changed, 38 insertions(+), 13 deletions(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt index 54a78bfcff..9e32bd2aa5 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/model/OchCommonLoginStatusDefaultModel.kt @@ -37,16 +37,13 @@ object OchCommonLoginStatusDefaultModel : OchCommonLoginStatusModel() { } loginCallback?.loginSuccess(data) - updateLoginLocalStatus(isLogin()) + data?.data?.driverStatus?.let { updateLoginLocalStatus(it) } } - private fun updateLoginLocalStatus(isLogin: Boolean) { - var loginCacheStatus = LoginCacheStatus(if (isLogin){ - 1 - }else { - 0 - },DateTimeUtil.getCurrentTimeStamp()) + private fun updateLoginLocalStatus(loginStatus: Int = 0) { + var loginCacheStatus = LoginCacheStatus(loginStatus,DateTimeUtil.getCurrentTimeStamp()) + CacheDataManager.instance.putCacheData(mContext, BusCacheKey.BUS_LOGIN_STATUS_CACHE, GsonUtils.toJson(loginCacheStatus)) } @@ -60,7 +57,7 @@ object OchCommonLoginStatusDefaultModel : OchCommonLoginStatusModel() { } loginCallback?.loginFail(isLogin) - updateLoginLocalStatus(isLogin) + updateLoginLocalStatus(0) } } \ No newline at end of file diff --git a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java index 143bb43db7..20baf93478 100644 --- a/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java +++ b/OCH/mogo-och-data/src/main/java/com/mogo/och/data/bean/BusStationBean.java @@ -1,5 +1,7 @@ package com.mogo.och.data.bean; +import java.util.Objects; + /** * 单个网约车小巴车站信息 * @@ -93,6 +95,28 @@ public class BusStationBean { this.leaving = leaving; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + BusStationBean that = (BusStationBean) o; + return siteId == that.siteId + && seq == that.seq + && Double.compare(that.gcjLon, gcjLon) == 0 + && Double.compare(that.gcjLat, gcjLat) == 0 + && Double.compare(that.lon, lon) == 0 + && Double.compare(that.lat, lat) == 0 + && drivingStatus == that.drivingStatus + && leaving == that.leaving + && name.equals(that.name) + && nameKr.equals(that.nameKr); + } + + @Override + public int hashCode() { + return Objects.hash(siteId, name, nameKr, seq, gcjLon, gcjLat, lon, lat, drivingStatus, leaving); + } + @Override public String toString() { return "BusStationBean{" + @@ -107,4 +131,6 @@ public class BusStationBean { ", leaving=" + leaving + '}'; } + + } diff --git a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java index 58ac9e3d17..fa66012a85 100644 --- a/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java +++ b/OCH/mogo-och-shuttle-passenger/src/jinlvvan/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java @@ -273,7 +273,7 @@ public class BusPassengerModel { clearLocalRouteResult(); return; } - + CallerLogger.INSTANCE.d( M_BUS_P + TAG, "queryDriverSiteByCoordinate = update"); routesResult = result; if (mRouteLineInfoCallback != null){ @@ -578,6 +578,7 @@ public class BusPassengerModel { public void dynamicCalculateRouteInfo() { //计算当前位置和下一站的剩余点集合 //计算剩余点总里程和时间 + CallerLogger.INSTANCE.d(M_BUS_P + TAG, "轨迹排查==mTwoStationsRouts.size() = " + mTwoStationsRouts.size()); if (mTwoStationsRouts.size() == 0){ calculateTwoStationsRoute(); } diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt index 98a3185650..977392b271 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt +++ b/OCH/mogo-och-shuttle-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt @@ -421,7 +421,7 @@ class PM2DrivingModel private constructor() { updateLocalOrder() return } - + d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= update") routesResult = result mDrivingInfoCallback?.updateLine(result.name, result.runningDur) @@ -445,6 +445,7 @@ class PM2DrivingModel private constructor() { mNextStationIndex = i + 1 return } else if (station.drivingStatus == BusPassengerConst.STATION_STATUS_STOPPED && !station.isLeaving) { + d(SceneConstant.M_BUS_P+TAG,"och-rotting--arrived ") mPreRouteIndex = 0 isGoingToNextStation = false startOrStopCalculateRouteInfo(false) @@ -484,7 +485,7 @@ class PM2DrivingModel private constructor() { fun dynamicCalculateRouteInfo(){ //计算当前位置和下一站的剩余点集合 //计算剩余点总里程和时间 - + d(SceneConstant.M_BUS_P + TAG, "och-rotting==mTwoStationsRouts.size() = " + mTwoStationsRouts.size) //计算当前位置和下一站的剩余点集合 //计算剩余点总里程和时间 if (mTwoStationsRouts.size == 0) { diff --git a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml index 9f2f2d5094..96812ea23f 100644 --- a/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml +++ b/OCH/mogo-och-shuttle-passenger/src/m2/res/values/strings.xml @@ -13,7 +13,7 @@ m2_map_style.data m2_map_style_extra.data - Auto + AUTO 下一站： 已到站 暂无站点 diff --git a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java index 3b8cd646ce..f3e2f4c563 100644 --- a/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/mogo-och-shuttle/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -79,7 +79,6 @@ import com.mogo.och.common.module.voice.VoiceNotice; import com.mogo.och.common.module.bean.dpmsg.BusCacheKey; import com.mogo.och.data.bean.BusTransferData; import com.mogo.och.data.manager.cache.CacheDataManager; -import com.zhidao.socket.utils.LoginStatusUtil; import org.jetbrains.annotations.NotNull; @@ -829,6 +828,7 @@ public class OrderModel { private void pushCacheTransferData(BusRoutesResult result) { BusTransferData data = new BusTransferData(LoginStatusManager.isLogin() ? 1:0,result); + CallerLogger.INSTANCE.d(M_BUS + TAG, "pushCacheTransferData = " + GsonUtils.toJson(data)); CacheDataManager.Companion.getInstance().putCacheData(mContext, BusCacheKey.BUS_LINE_CACHE, GsonUtils.toJson(data)); From 2002a21907e9aa188fd2c18227bf9265b8a3de4a Mon Sep 17 00:00:00 2001 From: xuxinchao Date: Mon, 10 Apr 2023 17:27:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?[dev=5Frobobus-d=5F230322=5F3.0.0]=E8=B0=83?= =?UTF-8?q?=E6=95=B4M2=E5=B8=83=E5=B1=80=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/item_m_box_notice.xml | 2 +- .../src/main/res/layout/item_m_box_operation.xml | 2 +- .../src/main/res/layout/item_m_box_v2x.xml | 2 +- .../src/main/res/layout/layout_m_box_bubble.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml index 75d41bf8bf..9d2020f352 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_notice.xml @@ -1,6 +1,6 @@ From 9ae98eb2793d91f5e7c314c2fae8cbdd9fd7820d Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 10 Apr 2023 19:38:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?[3.0.0]=20=E5=A4=84=E7=90=86=E5=8C=85?= =?UTF-8?q?=E8=BD=A6=E5=8F=B8=E6=9C=BA=E7=AB=AF=E5=80=92=E8=AE=A1=E6=97=B6?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../magic/mogo/och/charter/callback/DriverM1OrderCallback.kt | 1 + .../com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt | 2 +- .../java/com/magic/mogo/och/charter/model/DriverM1Model.kt | 1 + .../com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt | 4 ++++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt index ac199b8ed6..32496916dc 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/callback/DriverM1OrderCallback.kt @@ -9,5 +9,6 @@ import com.magic.mogo.och.charter.bean.QueryCurrentOrderResponse interface DriverM1OrderCallback { fun updateOrderUI(orderStatus: QueryCurrentOrderResponse.Result) // 到达站 fun updateOverCountDown(minutes: Long) //倒计时ms + fun clearCountDown() //清除倒计时 fun updateReturnCarStatus(returnSuccess: Boolean) } \ No newline at end of file diff --git a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt index 08cf7824a9..8ad297cf23 100644 --- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt +++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/fragment/DriverM1Fragment.kt @@ -186,7 +186,7 @@ class DriverM1Fragment : CharterBaseFragment