From ca3e7b74ebbaeb0703297d9f69efa0de33bfb58c Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 29 Aug 2023 11:13:41 +0800 Subject: [PATCH 01/20] =?UTF-8?q?[6.0.0]=20[map]=20[3d=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E7=A6=81=E6=AD=A2=E9=80=9A=E8=BF=87=E6=8B=96=E5=8A=A8=E5=88=B0?= =?UTF-8?q?2d=E5=9C=B0=E5=9B=BE]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 35e36a15be..76d5a9a68f 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -161,6 +161,10 @@ public class AMapViewWrapper implements IMogoMapView, } private void initListeners() { + MapAutoViewHelper options = mMapView.getMapAutoViewHelper(); + if (options != null) { + options.setScaleVRMode(true); + } mMapView.setOnMarkClickListener(this); mMapView.setOnMapLoadedListener(this); mMapView.setOnMapTouchListener(this); From 551113e4a1cb57cea4a751f80f16d792dbd94c86 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Tue, 29 Aug 2023 12:07:22 +0800 Subject: [PATCH 02/20] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20fix:?= =?UTF-8?q?=20=E4=B9=98=E5=AE=A2=E5=B1=8F=20=E5=85=B3=E4=BA=8E=20taskType?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=20=E6=9B=B4=E6=96=B0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/passenger/constant/TaxiPassengerConst.kt | 1 + .../mogo/och/taxi/passenger/model/TaxiPassengerModel.kt | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt index 18dafa30be..49a0680760 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt @@ -38,6 +38,7 @@ class TaxiPassengerConst { const val EVENT_PARAM_UNABLE_START_REASON = "unable_start_reason" //任务类型 + const val TaskType_NONE = 0 // 无任务 const val TaskType_VIRTUAL = 1 // 虚拟任务 const val TaskType_DRIVE_TO_START = 2 // 接驾任务 const val TaskType_DRIVE_TO_END = 3 //送驾任务 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index c34839a75f..161ac6e44e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -35,6 +35,8 @@ import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBea import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_DRIVE_TO_END +import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_NONE +import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst.Companion.TaskType_VIRTUAL import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum.Companion.valueOf import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager @@ -155,8 +157,10 @@ object TaxiPassengerModel { object : OchCommonServiceCallback { override fun onSuccess(data: TaxiPassengerOrdersInServiceQueryRespBean) { d(M_TAXI_P + TAG, "queryInAndWaitOrders data.data=${GsonUtils.toJson(data.data)}") - //目前后端将一个订单拆分成了多个任务，乘客屏只关心 送驾 类型的任务，这里过滤其他任务避免干扰 - if (data.data.taskType != TaskType_DRIVE_TO_END) { + //目前后端将一个订单拆分成了多个任务，乘客屏只关心 送驾 类型的任务 + //20230829 后端修改了逻辑，在乘客屏startTask后taskType才会变成3 + if (data.data.taskType == TaskType_NONE || + data.data.taskType == TaskType_VIRTUAL) { d(M_TAXI_P + TAG, "queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data") // 如果上一个是 接驾或送驾任务 下一个是演练任务，需要reset页面状态 currentOCHOrder = null From 7ff1a3016012936b4fad58e54bbf9da18248a2f1 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 29 Aug 2023 16:06:33 +0800 Subject: [PATCH 03/20] =?UTF-8?q?[6.0.0]=201=E3=80=81=E6=A0=87=E5=AE=9A?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=80=E9=97=AA=E8=80=8C=E8=BF=87bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=202=E3=80=81=E5=88=B0=E7=AB=99=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=203=E3=80=81?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BE=85=E6=9C=8D=E5=8A=A1=E8=AE=A2=E5=8D=95?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/ui/task/TaxiCurrentTaskViewModel.kt | 9 +++++++-- .../mogo/och/taxi/ui/task/TaxiTaskModel.kt | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index 55818d14b4..208cff0afe 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -220,7 +220,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), override fun onOrderCancel() { VoiceNotice.showNotice("订单已经取消") - updateTaskAndOrderUi(null) +// updateTaskAndOrderUi(null) } override fun onOrderArriveAtEnd(orderNo: String) { @@ -253,12 +253,17 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), driveToNearestStationTask: StartServiceRespBean.Result?, currentTaskWithOrder: QueryCurrentTaskRespBean.Result? ) { - if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null && currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code) { + if (currentTaskWithOrder?.endSite != null && currentTaskWithOrder.startSite != null + && currentTaskWithOrder.currentStatus < TaskStatusEnum.CompleteTask.code) { VoiceNotice.showNotice("暂停接单啦！要完成当前订单哦") } else { VoiceNotice.showNotice("暂停接单啦") } // TODO 如果当前有订单就不要刷新 + if (currentTaskWithOrder?.startSite != null && + currentTaskWithOrder.endSite != null){ + return + } updateDriveToNearestStationTaskUI(driveToNearestStationTask) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index f57b295596..7c70c7a879 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -675,11 +675,12 @@ object TaxiTaskModel { // 任务为空 if (result.endSite == null && result.order == null) { d(TAG, "queryCurrentTaskOnce: 任务为空") - mCurrentTaskWithOrder = null - - mTaxiTaskWithOrderCallbackMap.forEach { - val listener = it.value - listener.onTaskWithOrderDataChanged(null) +// mCurrentTaskWithOrder = null + if (mDriveToNearestStationTask == null) { + mTaxiTaskWithOrderCallbackMap.forEach { + val listener = it.value + listener.onTaskWithOrderDataChanged(null) + } } return } @@ -776,7 +777,7 @@ object TaxiTaskModel { when (data.data.orderStatus) { TaxiOrderStatusEnum.Cancel.code -> { //更新本地标志位 - mCurrentTaskWithOrder?.order = null + mCurrentTaskWithOrder = null mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value listener.onOrderCancel() @@ -795,7 +796,7 @@ object TaxiTaskModel { TaxiOrderStatusEnum.JourneyCompleted.code -> { //更新本地标志位 - mCurrentTaskWithOrder?.order = null + mCurrentTaskWithOrder = null mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value listener.onOrderJourneyCompleted() @@ -1109,8 +1110,8 @@ object TaxiTaskModel { "judgeEndStation() stationAngle = $stationAngle" ) - if ((!checkCurrentTaskCondition() - || (getCurTaskStatus() == TaskStatusEnum.StartTask.code)) + if (!checkCurrentTaskCondition() + || getCurTaskStatus() != TaskStatusEnum.StartTask.code ) { i(TAG, "task null or TaskStatus = ${getCurTaskStatus()}") return From 459e64b8e84b97a8e503eb21b30a03831e4dcde0 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 29 Aug 2023 17:02:05 +0800 Subject: [PATCH 04/20] =?UTF-8?q?[6.0.0]=20=E5=BE=85=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/ui/task/TaxiCurrentTaskViewModel.kt | 13 +------------ .../och/taxi/ui/task/TaxiNextTaskFragment.kt | 13 +++++++++++++ .../och/taxi/ui/task/TaxiOrderCancelDialog.java | 5 +++++ .../com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 17 +++++++++++++++++ 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index 208cff0afe..7d823c9949 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -91,18 +91,7 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), private fun cancelOrder(cancelType: Int) { val currentTaskWithOrder = TaxiTaskModel.getCurrentTaskWithOrder() currentTaskWithOrder?.order?.also { - cancelOrder(AbsMogoApplication.getApp().applicationContext, - it.orderNo, - cancelType, - object : OchCommonServiceCallback { - override fun onSuccess(data: BaseData?) { - d(TAG, "handleCancelOrder() = onSuccess") - } - - override fun onFail(code: Int, msg: String?) { - d(TAG, "handleCancelOrder() $code $msg") - } - }) + TaxiTaskModel.cancelOrder(it.orderNo,cancelType) } } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt index f81f02638c..1951dbf795 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiNextTaskFragment.kt @@ -7,6 +7,7 @@ import android.view.View import androidx.core.content.ContextCompat import com.mogo.commons.mvp.BaseFragment import com.mogo.eagle.core.function.main.MainMoGoApplication +import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant import com.mogo.och.taxi.R import com.mogo.och.taxi.bean.OrderDetail @@ -14,6 +15,7 @@ import com.mogo.och.taxi.bean.QueryCurrentTaskRespBean import com.mogo.och.taxi.constant.TaskStatusEnum import com.mogo.och.taxi.constant.TaskTypeEnum import com.mogo.och.taxi.utils.TaskUtils +import kotlinx.android.synthetic.main.task_fragment_current.cancelOrder import kotlinx.android.synthetic.main.task_fragment_current.endStationName import kotlinx.android.synthetic.main.task_fragment_current.mCurrentTaskLayout import kotlinx.android.synthetic.main.task_fragment_current.naviToEnd @@ -49,6 +51,17 @@ class TaxiNextTaskFragment : BaseFragment() { } override fun initViews() { + cancelOrder.onClick { //取消待服务订单 + val currentWithOrder = TaxiTaskModel.getCurrentTaskWithOrder() + if (currentWithOrder?.order != null) { + val order = currentWithOrder.order + activity?.also { + TaxiOrderCancelDialog(it, order!!.orderStatus) { type -> + TaxiTaskModel.cancelOrder(order.orderNo,type) + }.show() + } + } + } showNoNextTaskView() } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java index 64e8a5a649..58d8a05621 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiOrderCancelDialog.java @@ -53,6 +53,11 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi private void initReasonArray() { TaxiOrderStatusEnum ochStatus = TaxiOrderStatusEnum.valueOf(mOrderStatus); switch (ochStatus) { + case None: + mContentArrays = new String[]{TaxiOrderCancelReasons.BookPassengerCancel.getMsg(), + TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.BookJourneyConflict.getMsg(), + TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.BookOther.getMsg()}; + return; case OnTheWayToStart: mContentArrays = new String[]{TaxiOrderCancelReasons.CarBroken.getMsg(), TaxiOrderCancelReasons.DeviceBroken.getMsg(), TaxiOrderCancelReasons.BatteryLow.getMsg(), TaxiOrderCancelReasons.DriverIsIll.getMsg(), diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 7c70c7a879..6b9cad59c4 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -748,6 +748,23 @@ object TaxiTaskModel { }) } + /** + * 取消订单 进行中/待服务 + */ + fun cancelOrder(orderNo: String,cancelType: Int){ + TaxiTaskWithOrderServiceManager.cancelOrder(AbsMogoApplication.getApp().applicationContext, + orderNo, cancelType, + object : OchCommonServiceCallback { + override fun onSuccess(data: BaseData?) { + d(TAG, "handleCancelOrder() = onSuccess") + } + + override fun onFail(code: Int, msg: String?) { + d(TAG, "handleCancelOrder() $code $msg") + } + }) + } + fun updateLocalCalculateStation() { if (mCurrentTaskWithOrder == null) return if (mCurrentTaskWithOrder!!.startSite != null && mCurrentTaskWithOrder!!.endSite != null From 25eb40df45e8f9ecc70dd2fcb9d8e1c3a8b66075 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 29 Aug 2023 18:04:08 +0800 Subject: [PATCH 05/20] =?UTF-8?q?[6.0.0]=20[taxi]=20[statusbar=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=92=8C=E5=8F=B8=E6=9C=BA=E5=B1=8F=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wigets/DriverConnectStatusView.kt | 47 +++++++++++++++++++ .../res/drawable/driver_connect_statis.xml | 5 ++ .../src/main/res/layout/taxi_p_statusview.xml | 9 ++++ .../src/main/res/layout/taxi_p_statusview.xml | 9 ++++ 4 files changed, 70 insertions(+) create mode 100644 OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverConnectStatusView.kt create mode 100644 OCH/mogo-och-common-module/src/main/res/drawable/driver_connect_statis.xml diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverConnectStatusView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverConnectStatusView.kt new file mode 100644 index 0000000000..dcfd21e62c --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/DriverConnectStatusView.kt @@ -0,0 +1,47 @@ +package com.mogo.och.common.module.wigets + +import android.content.Context +import android.util.AttributeSet +import android.view.View +import androidx.appcompat.widget.AppCompatImageView +import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger +import com.mogo.eagle.core.utilcode.util.UiThreadHandler +import com.mogo.och.common.module.R +import com.mogo.och.common.module.manager.loopmanager.BizLoopManager +import com.mogo.och.common.module.manager.loopmanager.LoopInfo + +class DriverConnectStatusView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : AppCompatImageView(context, attrs, defStyleAttr) { + companion object { + const val TAG = "StatusBarView" + } + + init { + setImageResource(R.drawable.driver_connect_statis) + } + + override fun onAttachedToWindow() { + super.onAttachedToWindow() + BizLoopManager.setLoopFunction(TAG, LoopInfo(3, ::showConnectStatusWithDriver)) + } + + override fun onDetachedFromWindow() { + super.onDetachedFromWindow() + BizLoopManager.removeLoopFunction(TAG) + } + + private fun showConnectStatusWithDriver(){ + UiThreadHandler.post { + CallerLogger.d(TAG,"司机屏连接状态：${CallerTelematicManager.getClientConnStatus()}") + visibility = if(CallerTelematicManager.getClientConnStatus()){ + View.GONE + }else{ + View.VISIBLE + } + } + } +} \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/res/drawable/driver_connect_statis.xml b/OCH/mogo-och-common-module/src/main/res/drawable/driver_connect_statis.xml new file mode 100644 index 0000000000..3dde439fdb --- /dev/null +++ b/OCH/mogo-och-common-module/src/main/res/drawable/driver_connect_statis.xml @@ -0,0 +1,5 @@ + + + diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_statusview.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_statusview.xml index ecd2990ddc..5b75be9662 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_statusview.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_statusview.xml @@ -8,6 +8,15 @@ tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" tools:ignore="MissingDefaultResource"> + + + + + + Date: Tue, 29 Aug 2023 18:11:56 +0800 Subject: [PATCH 06/20] =?UTF-8?q?[6.0.0][oom]=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E9=80=BB=E8=BE=91=E5=86=85?= =?UTF-8?q?=E5=AD=98=E5=8D=A0=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index ee98fd6a33..e1391b3ef8 100644 --- a/config.gradle +++ b/config.gradle @@ -215,7 +215,7 @@ ext { btrace : "com.bytedance.btrace:rhea-core:2.0.0", mofang_runtime : "com.mogo.eagle.core.mofang:runtime:2.0.6", - log_runtime : "com.mogo.eagle.core.log.record:runtime:1.0.9", + log_runtime : "com.mogo.eagle.core.log.record:runtime:1.0.10", // 安全证书 passport_secret : "com.zhidaoauto:sdk-java:1.0.5-SNAPSHOT", From 141dafbbed62ea5fbae1cc9d80e6e87e173af9ee Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 29 Aug 2023 18:13:29 +0800 Subject: [PATCH 07/20] [6.0.0] roma change and update log version --- .../business/ai/AiCloudIdentifyDataManager.kt | 11 ++++++++++- .../core/data/biz/trafficlight/TrafficLightStatus.kt | 2 +- .../mogo/eagle/core/data/deva/chain/ChainConstant.kt | 1 + gradle.properties | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt index 524ec313b2..8a63e45178 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt @@ -17,6 +17,7 @@ import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_RO import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_CHANGE_END import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_END import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_ERROR +import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_READY_START import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_MAP_START import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_CODE_ROMA_REQUEST_DELAY @@ -246,9 +247,17 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener, 0 -> { MapBizTrace.log( CHAIN_CODE_ROMA_REQUEST_OK, + CHAIN_CODE_ROMA_MAP_READY_START, + TAG, + mutableMapOf("romaStart" to "地图准备漫游动画") + ) + } + 4 -> { + MapBizTrace.log( + CHAIN_CODE_ROMA_MAP_READY_START, CHAIN_CODE_ROMA_MAP_START, TAG, - mutableMapOf("romaStart" to "地图开始漫游") + mutableMapOf("romaStart" to "地图漫游动画结束,开始漫游") ) showAiCloud.set(true) FunctionBuildConfig.isDrawIdentifyData = false diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt index 8b4fd7ede3..7587fcf105 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/biz/trafficlight/TrafficLightStatus.kt @@ -31,7 +31,7 @@ fun TrafficLightStatus.turnRedAtOnce(): Boolean { data class TrafficLightStatus( val phaseNo: String, //相位编号 val color: String, //灯态： 红灯-R，绿灯-G，绿闪-FG，黄-Y，B-黑 - val remain: Int //倒计时-秒 + val remain: Int //倒计时-秒 todo 云端string类型 如果返回 -- 解析异常 ) { } \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt index 17cc9cf1c1..f243da70ef 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/deva/chain/ChainConstant.kt @@ -118,6 +118,7 @@ class ChainConstant { const val CHAIN_CODE_ROMA_REQUEST_ERROR = "CHAIN_CODE_ROMA_REQUEST_ERROR" const val CHAIN_CODE_ROMA_REQUEST_DELAY = "CHAIN_CODE_ROMA_REQUEST_DELAY" const val CHAIN_CODE_ROMA_MODE_INVOKE = "CHAIN_CODE_ROMA_MODE_INVOKE" + const val CHAIN_CODE_ROMA_MAP_READY_START = "CHAIN_CODE_ROMA_MAP_READY_START" const val CHAIN_CODE_ROMA_MAP_START = "CHAIN_CODE_ROMA_MAP_START" const val CHAIN_CODE_ROMA_MAP_END = "CHAIN_CODE_ROMA_MAP_END" const val CHAIN_CODE_ROMA_MAP_CHANGE_END = "CHAIN_CODE_ROMA_MAP_CHANGE_END" diff --git a/gradle.properties b/gradle.properties index cab15485b6..06be73deb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -58,7 +58,7 @@ bytex.ASM_API=ASM7 ################ 外部依赖引用 ################ # loglib -LOGLIB_VERSION=1.9.5-SNAPSHOT +LOGLIB_VERSION=1.9.6 ######## MogoAiCloudSDK Version ######## # 网络请求LOGLIB_VERSION MOGO_NETWORK_VERSION=1.4.7.16 @@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.16 MOGO_TELEMATIC_VERSION=1.4.7.16 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.14.3.4 +MAP_SDK_VERSION=2.14.3.5 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7 From bbc4d1af02a514d87bb6caaaa5c97c89295e4d0a Mon Sep 17 00:00:00 2001 From: renwj Date: Tue, 29 Aug 2023 18:14:55 +0800 Subject: [PATCH 08/20] =?UTF-8?q?[6.0.0][=E5=85=A8=E9=87=8F=E6=97=A5?= =?UTF-8?q?=E5=BF=97]=20=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 --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index e1391b3ef8..605fd0bba3 100644 --- a/config.gradle +++ b/config.gradle @@ -215,7 +215,7 @@ ext { btrace : "com.bytedance.btrace:rhea-core:2.0.0", mofang_runtime : "com.mogo.eagle.core.mofang:runtime:2.0.6", - log_runtime : "com.mogo.eagle.core.log.record:runtime:1.0.10", + log_runtime : "com.mogo.eagle.core.log.record:runtime:1.0.12", // 安全证书 passport_secret : "com.zhidaoauto:sdk-java:1.0.5-SNAPSHOT", From 4e387a95a14d81eb17e811972c92f7b9620aa386 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 29 Aug 2023 18:31:00 +0800 Subject: [PATCH 09/20] =?UTF-8?q?[6.0.0][Fix]=E8=A7=A3=E5=86=B3Koom?= =?UTF-8?q?=E5=BA=93=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function-impl/mogo-core-function-devatools/build.gradle | 2 -- .../zhjt/mogo_core_function_devatools/DevaToolsProvider.kt | 2 -- foudations/mogo-commons/build.gradle | 3 ++- .../src/main/java/com/mogo/commons/AbsMogoApplication.java | 6 ++++++ .../src/main/java/com/mogo/commons}/koom/KoomInitTask.kt | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) rename {core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools => foudations/mogo-commons/src/main/java/com/mogo/commons}/koom/KoomInitTask.kt (94%) diff --git a/core/function-impl/mogo-core-function-devatools/build.gradle b/core/function-impl/mogo-core-function-devatools/build.gradle index ea909edcaa..dd29601f0e 100644 --- a/core/function-impl/mogo-core-function-devatools/build.gradle +++ b/core/function-impl/mogo-core-function-devatools/build.gradle @@ -87,8 +87,6 @@ dependencies { implementation rootProject.ext.dependencies.androidxrecyclerview implementation rootProject.ext.dependencies.flexbox implementation rootProject.ext.dependencies.androidautoSize - implementation rootProject.ext.dependencies.koomnative - implementation rootProject.ext.dependencies.koomxhook implementation rootProject.ext.dependencies.mofang_runtime implementation rootProject.ext.dependencies.log_runtime implementation group: "com.tencent.matrix", name: "matrix-android-lib", version: MATRIX_VERSION, changing: true diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt index ef0a9fb0c8..821101bcb9 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/DevaToolsProvider.kt @@ -45,7 +45,6 @@ import com.zhjt.mogo_core_function_devatools.block.* import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigCenter.Companion.bizConfigCenter import com.zhjt.mogo_core_function_devatools.funcconfig.FuncConfigImpl -import com.zhjt.mogo_core_function_devatools.koom.KoomInitTask import com.zhjt.mogo_core_function_devatools.logcat.* import com.zhjt.mogo_core_function_devatools.logcatch.MogoLogCatchManager import com.zhjt.mogo_core_function_devatools.lookaround.* @@ -98,7 +97,6 @@ class DevaToolsProvider : IDevaToolsProvider { //链路相关 traceManager.init(mContext!!) if (DebugConfig.isDebug()) { - KoomInitTask.init(AbsMogoApplication.getApp()) initMatrix() } ttsManager.initTts(mContext!!) //todo 扶风 优化 diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index c3353c9883..f39dbedbe7 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -57,7 +57,8 @@ dependencies { api 'org.greenrobot:eventbus:3.1.1' api rootProject.ext.dependencies.androidautoSize - + implementation rootProject.ext.dependencies.koomnative + implementation rootProject.ext.dependencies.koomxhook if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { api rootProject.ext.dependencies.mogoaicloudservicesdk api rootProject.ext.dependencies.ttsbase diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java index 9d4d5fdb61..b66d7a3b87 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java @@ -10,6 +10,8 @@ import android.widget.ImageView; import android.widget.TextView; import com.mogo.commons.crash.FinalizeCrashFixer; +import com.mogo.commons.debug.DebugConfig; +import com.mogo.commons.koom.KoomInitTask; import com.mogo.commons.screen.ScreenHelper; import com.mogo.commons.module.MogoServices; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; @@ -43,6 +45,10 @@ public abstract class AbsMogoApplication extends Application { super.onCreate(); AutoSize.checkAndInit(this); ScreenHelper.setScreenConfig(this); + // 非主进程也需要初始化 + if (DebugConfig.isDebug()) { + KoomInitTask.INSTANCE.init(AbsMogoApplication.getApp()); + } if (!shouldInit()) { return; } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/koom/KoomInitTask.kt b/foudations/mogo-commons/src/main/java/com/mogo/commons/koom/KoomInitTask.kt similarity index 94% rename from core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/koom/KoomInitTask.kt rename to foudations/mogo-commons/src/main/java/com/mogo/commons/koom/KoomInitTask.kt index 6fca530bea..f442e7e573 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/koom/KoomInitTask.kt +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/koom/KoomInitTask.kt @@ -1,4 +1,4 @@ -package com.zhjt.mogo_core_function_devatools.koom +package com.mogo.commons.koom import android.app.Application import android.os.Build @@ -7,6 +7,7 @@ import com.kwai.koom.base.InitTask import com.kwai.koom.base.MonitorManager object KoomInitTask : InitTask { + override fun init(application: Application) { val config = CommonConfig.Builder() .setApplication(application) // Set application From e43d42f63c166b9c5bd5f8ecf03142e8a0ebdba4 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Tue, 29 Aug 2023 18:33:25 +0800 Subject: [PATCH 10/20] =?UTF-8?q?[6.0.0]=20=E4=B9=98=E5=AE=A2=E5=88=B0?= =?UTF-8?q?=E8=BE=BE=E4=B8=8A=E8=BD=A6=E7=82=B9=E5=90=8E=E5=86=8D=E6=8B=89?= =?UTF-8?q?=E5=8F=96=E9=80=81=E9=A9=BE=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt | 10 ++++++++++ .../java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 10 +++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt index e18de9420a..a7fbcc2e5a 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/bean/TaxiDriverTaskWithOrderBean.kt @@ -142,6 +142,16 @@ data class QueryCurrentTaskRespBean(var data: Result?) : BaseData() { return data.order!!.orderStatus == TaxiOrderStatusEnum.ArriveAtStart.code } + fun isUserArriveAtStart(data: QueryCurrentTaskRespBean.Result?): Boolean { + if (data == null) { + return false + } + if (data.order == null) { + return false + } + return data.order!!.orderStatus == TaxiOrderStatusEnum.UserArriveAtStart.code + } + /** * with task.currentStatus == StartTask */ diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 6b9cad59c4..09edff6b75 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -685,12 +685,16 @@ object TaxiTaskModel { return } - //当前任务完成且订单状态到达乘客上车点, 则立马去拉取任务 不再等30s,否则送驾任务要等30s后才能去执行 - if (result?.currentStatus == TaskStatusEnum.CompleteTask.code) { + //当前任务完成且订单状态到达乘客上车点, 则立马去拉取任务 不再等120s,否则送驾任务要等120s后才能去执行(8.29废) + //8.29更新: 当前任务完成且订单状态为乘客已上车, 则立马去拉取任务 不再等120s,否则送驾任务要等120s后才能去执行 + // 主要是解决A-B演练任务同时接到A-B订单状态流转的问题 + //注意: 需要去除到达乘客上车点的节点, 这个节点不拉取任务 + if (result?.currentStatus == TaskStatusEnum.CompleteTask.code + && !QueryCurrentTaskRespBean.isOrderArriveAtStart(result)) { mTaxiTaskWithOrderCallbackMap.forEach { val listener = it.value listener.onTaskCompleted( - QueryCurrentTaskRespBean.isOrderArriveAtStart( + QueryCurrentTaskRespBean.isUserArriveAtStart( result ), result.endSite!!.siteId From cfd0a4b41040df89df35a176a7a4f65b756e5907 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 29 Aug 2023 18:38:53 +0800 Subject: [PATCH 11/20] [6.0.0] fix jira bug --- .../src/main/java/com/mogo/map/AMapViewWrapper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java index 76d5a9a68f..925c9f1a6b 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java @@ -161,10 +161,6 @@ public class AMapViewWrapper implements IMogoMapView, } private void initListeners() { - MapAutoViewHelper options = mMapView.getMapAutoViewHelper(); - if (options != null) { - options.setScaleVRMode(true); - } mMapView.setOnMarkClickListener(this); mMapView.setOnMapLoadedListener(this); mMapView.setOnMapTouchListener(this); @@ -724,6 +720,12 @@ public class AMapViewWrapper implements IMogoMapView, public void onMapLoaded() { CallerLogger.i(M_MAP + TAG, "autoop--onMapLoaded: "); if (checkAMapView()) { + MapAutoViewHelper options = mMapView.getMapAutoViewHelper(); + if (options != null) { + options.setScaleVRMode(true); + }else{ + CallerLogger.i(M_MAP + TAG, "autoop--getMapAutoViewHelper is null"); + } CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); MogoMapListenerHandler.Companion.getMogoMapListenerHandler().onMapChanged(ObjectUtils.fromAMap(cameraPosition.getTarget()), cameraPosition.getZoom(), From fa0214179de20f7e8b5e88f702d6bd5d0abf16fe Mon Sep 17 00:00:00 2001 From: zhongchao Date: Tue, 29 Aug 2023 18:53:32 +0800 Subject: [PATCH 12/20] [6.0.0] open the map log when catch --- .../logcatch/MogoLogCatchManager.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt index 01c89acbde..410e0d8187 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/logcatch/MogoLogCatchManager.kt @@ -18,6 +18,7 @@ import com.mogo.eagle.core.function.api.map.deva.IMoGoMapDevaProvider import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsListenerManager import com.mogo.eagle.core.function.call.map.CallerMapDevaListenerManager +import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger import com.mogo.eagle.core.utilcode.mogo.logger.LogLevel import com.mogo.eagle.core.utilcode.mogo.logger.Logger @@ -223,6 +224,7 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl config.isShowDebugLog = true config.isShowNetDebugLog = true } + CallerMapUIServiceManager.getMapUIController()?.setDebugMode(true) CallerAutoPilotControlManager.setEnableLog(true) } @@ -236,6 +238,7 @@ object MogoLogCatchManager : IMogoOnMessageListener, Handl config.isShowDebugLog = false config.isShowNetDebugLog = false } + CallerMapUIServiceManager.getMapUIController()?.setDebugMode(false) CallerAutoPilotControlManager.setEnableLog(false) } From 5121ada1df8c33eab35c6c8219680063ced3daee Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 30 Aug 2023 10:38:24 +0800 Subject: [PATCH 13/20] =?UTF-8?q?[6.0.0]=20[map]=20[=E9=AB=98=E7=B2=BE?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E5=8D=87=E7=BA=A7]?= 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 06be73deb3..98a46eff2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -80,7 +80,7 @@ MOGO_LOCATION_VERSION=1.4.7.16 MOGO_TELEMATIC_VERSION=1.4.7.16 ######## MogoAiCloudSDK Version ######## # 自研地图 -MAP_SDK_VERSION=2.14.3.5 +MAP_SDK_VERSION=2.14.3.7 MAP_SDK_OPERATION_VERSION=1.1.4.1 # websocket WEBSOCKET_VERSION=1.1.7 From 6d5661f91731c33ebfcaa983d1e978e04387c5c4 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Wed, 30 Aug 2023 11:40:00 +0800 Subject: [PATCH 14/20] =?UTF-8?q?[6.0.0]=20[autopilo]=20[=E5=90=90?= =?UTF-8?q?=E5=8F=B8=E6=B7=BB=E5=8A=A0=E6=8D=A2=E8=A1=8C=E5=A4=84=E7=90=86?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/manager/OCHAdasAbilityManager.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java index a3d85fbfd8..0c8b505082 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/manager/OCHAdasAbilityManager.java @@ -54,7 +54,20 @@ public class OCHAdasAbilityManager implements IMoGoAutopilotActionsListener, IMo } public String getAutopilotUnAbilityReason(){ - return unableAutopilotReasons == null ? "" : unableAutopilotReasons.toString();//TODO 临时toString 需要拼接数据 + try { + if(unableAutopilotReasons==null||unableAutopilotReasons.isEmpty()){ + return "未知异常"; + }else { + StringBuilder stringBuilder = new StringBuilder(); + for (UnableAutopilotReason unableAutopilotReason : unableAutopilotReasons) { + stringBuilder.append(unableAutopilotReason.toString()).append("\n"); + } + return stringBuilder.toString(); + } + }catch (Exception e){ + e.printStackTrace(); + return "未知异常"; + } } public String getStartFailedCode() { From 024838abb6630b6b1a5293903b95144a7b920377 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 30 Aug 2023 12:09:37 +0800 Subject: [PATCH 15/20] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20fix:?= =?UTF-8?q?=20=E5=8E=8B=E6=B5=8B=20ViewModel=E6=9C=AA=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98=EF=BC=9B=20fix:=20=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8F=20=E5=88=B0=E8=BE=BE=E4=B8=8A=E8=BD=A6?= =?UTF-8?q?=E7=82=B9=E5=90=8E=20=E5=90=8E=E7=AB=AF=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=8A=B6=E6=80=81=20=E5=BB=B6=E8=BF=9F=20=EF=BC=8C=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=95=B0=E6=8D=AE=EF=BC=9B=20refactor:=20=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E5=B1=8F=20=E5=A2=9E=E5=8A=A0=E6=B8=85=E9=99=A4=20?= =?UTF-8?q?=E6=A6=82=E8=A7=88=20=E4=B8=AD=E8=BD=A8=E8=BF=B9=E5=92=8CMarker?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E6=9C=BA=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taxi/ui/task/TaxiCurrentTaskFragment.kt | 12 +++++- .../passenger/model/TaxiPassengerModel.kt | 37 +++++++++++++++---- .../presenter/BaseTaxiPassengerPresenter.kt | 2 + 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 5ececda8c5..327a135867 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -16,6 +16,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02Lis import com.mogo.eagle.core.function.main.MainMoGoApplication import com.mogo.eagle.core.network.utils.GsonUtil import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.e import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.i import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI import com.mogo.eagle.core.utilcode.util.ClickUtils @@ -231,7 +232,11 @@ class TaxiCurrentTaskFragment : BaseFragment(), } fun onCarTakeOrderStatusChanged() { - mViewModel.sendUiIntent(TaskUiIntent.StartOrEndTakeOrder) + if (this::mViewModel.isInitialized) { + mViewModel.sendUiIntent(TaskUiIntent.StartOrEndTakeOrder) + } else { + e(TAG, "onCarTakeOrderStatusChanged: mViewModel is not Initialized") + } } /** @@ -419,7 +424,10 @@ class TaxiCurrentTaskFragment : BaseFragment(), MainMoGoApplication.getApp().applicationContext, R.drawable.task_order_type_btn_bg ) - orderPhoneAndNum.text = TaskUtils.getCurrentTaskPhoneNumAndPassengerCountHtml(order.bookingUserPhone, order.passengerSize) + orderPhoneAndNum.text = TaskUtils.getCurrentTaskPhoneNumAndPassengerCountHtml( + order.bookingUserPhone, + order.passengerSize + ) startStationName.text = order.orderStartSite?.siteName endStationName.text = order.orderEndSite?.siteName diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index 161ac6e44e..6e5a910e77 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -156,12 +156,19 @@ object TaxiPassengerModel { TaxiPassengerServiceManager.queryOrdersInAndWaitService( object : OchCommonServiceCallback { override fun onSuccess(data: TaxiPassengerOrdersInServiceQueryRespBean) { - d(M_TAXI_P + TAG, "queryInAndWaitOrders data.data=${GsonUtils.toJson(data.data)}") + d( + M_TAXI_P + TAG, + "queryInAndWaitOrders data.data=${GsonUtils.toJson(data.data)}" + ) //目前后端将一个订单拆分成了多个任务，乘客屏只关心 送驾 类型的任务 //20230829 后端修改了逻辑，在乘客屏startTask后taskType才会变成3 if (data.data.taskType == TaskType_NONE || - data.data.taskType == TaskType_VIRTUAL) { - d(M_TAXI_P + TAG, "queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data") + data.data.taskType == TaskType_VIRTUAL + ) { + d( + M_TAXI_P + TAG, + "queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data" + ) // 如果上一个是 接驾或送驾任务 下一个是演练任务，需要reset页面状态 currentOCHOrder = null orderStatusChange() @@ -180,11 +187,19 @@ object TaxiPassengerModel { val currentOrder = data.data.order currentLineId = data.data.lineId currentTrajectoryInfo = data.data.trajectoryInfoByQuery - if (currentOCHOrder == null - || currentOCHOrder?.orderStatus != currentOrder.orderStatus - ) { + if (currentOCHOrder == null) { currentOCHOrder = currentOrder orderStatusChange() + } else if (currentOCHOrder?.orderStatus != currentOrder.orderStatus) { + if (currentOCHOrder?.orderStatus == TaxiPassengerOrderStatusEnum.UserArriveAtStart.code + && currentOrder.orderStatus < TaxiPassengerOrderStatusEnum.UserArriveAtStart.code + ) { + // 0830 UserArriveAtStart 状态是乘客屏本地在用户验证后本地设置，而且因为后端查询数据有延迟 + // 这里过下过滤，如果当前是UserArriveAtStart 且后端返回是之前状态，不更新数据 + } else { + currentOCHOrder = currentOrder + orderStatusChange() + } } else { currentOCHOrder = currentOrder } @@ -209,14 +224,20 @@ object TaxiPassengerModel { * 仅用于轮询时查到本地有mCurrentOCHOrder但请求结果无进行中单or orderId不一致是复查本地currentOrder */ private fun queryCurrentOrderStatus() { - d(M_TAXI_P + TAG, "queryCurrentOrderStatus: currentOCHOrder.orderNo=${currentOCHOrder?.orderNo}") + d( + M_TAXI_P + TAG, + "queryCurrentOrderStatus: currentOCHOrder.orderNo=${currentOCHOrder?.orderNo}" + ) currentOCHOrder?.orderNo?.let { TaxiPassengerServiceManager.queryOrderById( mContext!!, it, object : OchCommonServiceCallback { override fun onSuccess(data: TaxiPassengerOrderQueryRespBean) { - d(M_TAXI_P + TAG, "queryCurrentOrderStatus: onSuccess data=${GsonUtils.toJson(data)}") + d( + M_TAXI_P + TAG, + "queryCurrentOrderStatus: onSuccess data=${GsonUtils.toJson(data)}" + ) if (data.data != null && currentOCHOrder != null && currentOCHOrder!!.orderNo == data.data.orderNo diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt index 8afb17216f..88c3ad387a 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -71,6 +71,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : mView?.showOrHideArrivedEndLayout(isShow = false) mView?.showOrHidePressengerCheckPager(true) mView?.showOrHideStartAutopilotView(isShow = false) + overMapViewClear() } TaxiPassengerOrderStatusEnum.UserArriveAtStart -> { @@ -78,6 +79,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : mView?.showOrHideArrivedEndLayout(isShow = false) mView?.showOrHidePressengerCheckPager(isShow = false) mView?.showOrHideStartAutopilotView(isShow = true) + overMapViewClear() } TaxiPassengerOrderStatusEnum.OnTheWayToEnd -> { From 043b07acecb6ea3afd7c3e7fa0693f8d3c3e80f5 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 30 Aug 2023 12:22:21 +0800 Subject: [PATCH 16/20] =?UTF-8?q?[6.0.0]=20Taxipassenger/unmanned=20Taxipa?= =?UTF-8?q?ssenger=20=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E5=A2=9E=E5=8A=A0lineId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt | 1 + .../com/mogo/och/taxi/passenger/model/AutopilotManager.kt | 7 +++++-- .../taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt | 4 +++- .../mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt | 1 + .../com/mogo/och/taxi/passenger/model/AutopilotManager.kt | 6 ++++-- .../taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt | 4 +++- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt index 15cc6dad4f..078645cb83 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt @@ -38,6 +38,7 @@ class TaxiPassengerConst { const val EVENT_PARAM_START_NAME = "start_name" const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_ORDER_NUMBER = "order_num" + const val EVENT_PARAM_LINE_ID = "line_id" const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt index 2451c64151..acf69ba1c8 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt @@ -80,7 +80,9 @@ object AutopilotManager : IMoGoAutopilotStatusListener { + " ,startSiteName=" + TaxiPassengerModel.currentOCHOrder!!.startSiteAddr + " ,endSiteName=" + TaxiPassengerModel.currentOCHOrder!!.endSiteAddr ) - TaxiPassengerAnalyticsManager.triggerStartAutopilotEvent(false, false, TaxiPassengerModel.currentOCHOrder!!.startSiteAddr, TaxiPassengerModel.currentOCHOrder!!.endSiteAddr, TaxiPassengerModel.currentOCHOrder!!.orderNo) + TaxiPassengerAnalyticsManager.triggerStartAutopilotEvent(false, false, TaxiPassengerModel.currentOCHOrder!!.startSiteAddr, + TaxiPassengerModel.currentOCHOrder!!.endSiteAddr, TaxiPassengerModel.currentOCHOrder!!.orderNo, + TaxiPassengerModel.currentOCHOrder!!.lineId) } private fun initAutopilotControlParameters(): AutopilotControlParameters? { @@ -162,7 +164,8 @@ object AutopilotManager : IMoGoAutopilotStatusListener { true, TaxiPassengerModel.currentOCHOrder!!.startSiteAddr, TaxiPassengerModel.currentOCHOrder!!.endSiteAddr, - TaxiPassengerModel.currentOCHOrder!!.orderNo + TaxiPassengerModel.currentOCHOrder!!.orderNo, + TaxiPassengerModel.currentOCHOrder!!.lineId ) //startServicePilotDone() } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt index 5b4f60df6b..6116cf7383 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt @@ -64,7 +64,8 @@ object TaxiPassengerAnalyticsManager { * @param restart false（点击'开始服务'启动）/true（接管后点击'自动驾驶'按钮启动） * @param send 是否直接发送埋点（15s内开启成功则直接发送成功埋点） */ - fun triggerStartAutopilotEvent(restart: Boolean, send: Boolean, startName: String, endName: String, orderNo: String) { + fun triggerStartAutopilotEvent(restart: Boolean, send: Boolean, startName: String, endName: String, + orderNo: String, lineId: Long) { mStartAutopilotKey = if (restart) TaxiPassengerConst.EVENT_KEY_RESTART_AUTOPILOT else TaxiPassengerConst.EVENT_KEY_START_SERVICE if (send) { @@ -86,6 +87,7 @@ object TaxiPassengerAnalyticsManager { mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_NAME] = startName mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_END_NAME] = endName mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_ORDER_NUMBER] = orderNo + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_LINE_ID] = lineId startAutopiloTimeOut = RxUtils.createSubscribeOnOwnThread(TaxiPassengerConst.LOOP_PERIOD_15S) { // 15s内未开启，上报失败埋点 triggerStartAutopilotFailureEvent("", "15s后app等待超时") diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt index 49a0680760..4a12e389ae 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/constant/TaxiPassengerConst.kt @@ -27,6 +27,7 @@ class TaxiPassengerConst { const val EVENT_PARAM_START_NAME = "start_name" const val EVENT_PARAM_END_NAME = "end_name" const val EVENT_PARAM_ORDER_NUMBER = "order_num" + const val EVENT_PARAM_LINE_ID = "line_id" const val EVENT_PARAM_START_RESULT = "start_autopilot" // true/false const val EVENT_PARAM_START_FAILURE_CODE = "start_autopilot_failure_code" // 启动自驾失败code const val EVENT_PARAM_START_FAILURE_MSG = "start_autopilot_failure_msg" // 启动自驾失败原因 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt index d719e36932..15655bb16e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt @@ -86,7 +86,8 @@ object AutopilotManager : IMoGoAutopilotStatusListener { false, TaxiPassengerModel.currentOCHOrder!!.orderStartSite.siteName, TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName, - TaxiPassengerModel.currentOCHOrder!!.orderNo + TaxiPassengerModel.currentOCHOrder!!.orderNo, + TaxiPassengerModel.currentLineId ) } @@ -173,7 +174,8 @@ object AutopilotManager : IMoGoAutopilotStatusListener { true, TaxiPassengerModel.currentOCHOrder!!.orderStartSite.siteName, TaxiPassengerModel.currentOCHOrder!!.orderEndSite.siteName, - TaxiPassengerModel.currentOCHOrder!!.orderNo + TaxiPassengerModel.currentOCHOrder!!.orderNo, + TaxiPassengerModel.currentLineId ) //startServicePilotDone() } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt index 5b4f60df6b..54a0848119 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/utils/TaxiPassengerAnalyticsManager.kt @@ -64,7 +64,8 @@ object TaxiPassengerAnalyticsManager { * @param restart false（点击'开始服务'启动）/true（接管后点击'自动驾驶'按钮启动） * @param send 是否直接发送埋点（15s内开启成功则直接发送成功埋点） */ - fun triggerStartAutopilotEvent(restart: Boolean, send: Boolean, startName: String, endName: String, orderNo: String) { + fun triggerStartAutopilotEvent(restart: Boolean, send: Boolean, startName: String, endName: String, + orderNo: String, lineId: Long?) { mStartAutopilotKey = if (restart) TaxiPassengerConst.EVENT_KEY_RESTART_AUTOPILOT else TaxiPassengerConst.EVENT_KEY_START_SERVICE if (send) { @@ -86,6 +87,7 @@ object TaxiPassengerAnalyticsManager { mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_START_NAME] = startName mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_END_NAME] = endName mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_ORDER_NUMBER] = orderNo + mStartAutopilotParams[TaxiPassengerConst.EVENT_PARAM_LINE_ID] = lineId ?: 0 startAutopiloTimeOut = RxUtils.createSubscribeOnOwnThread(TaxiPassengerConst.LOOP_PERIOD_15S) { // 15s内未开启，上报失败埋点 triggerStartAutopilotFailureEvent("", "15s后app等待超时") From 2e4061b54034c8429b722aa1d3594aa9acc56de4 Mon Sep 17 00:00:00 2001 From: renwj Date: Wed, 30 Aug 2023 12:24:30 +0800 Subject: [PATCH 17/20] =?UTF-8?q?[6.0.0][=E9=AD=94=E6=96=B9]=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=AD=94=E6=96=B9=E4=BD=8E=E7=94=B5=E7=8A=B6=E6=80=81?= =?UTF-8?q?;=E4=BC=98=E5=8C=96=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/hmi/ui/widget/BlueToothView.kt | 19 +++++++++++++++++++ .../src/main/res/layout/view_blue_tooth.xml | 5 ++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt index 307e14b55e..664e86855a 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/BlueToothView.kt @@ -10,6 +10,7 @@ import android.widget.LinearLayout import com.mogo.eagle.core.function.api.devatools.mofang.* import com.mogo.eagle.core.function.call.devatools.* import com.mogo.eagle.core.function.hmi.R +import com.mogo.eagle.core.utilcode.util.ToastUtils import kotlinx.android.synthetic.main.view_blue_tooth.view.* /** @@ -26,6 +27,9 @@ open class BlueToothView: LinearLayout, IMoGoMoFangProvider.OnMoFangStatusListen LayoutInflater.from(context).inflate(R.layout.view_blue_tooth , this, true) visibility = View.GONE + + clipChildren = false + clipToPadding = false } companion object{ @@ -58,6 +62,21 @@ open class BlueToothView: LinearLayout, IMoGoMoFangProvider.OnMoFangStatusListen if (it.visibility != View.VISIBLE) { it.visibility = View.VISIBLE } + val oldTextColor = it.currentTextColor + if (battery <= 30) { + if (oldTextColor != Color.RED) { + it.setTextColor(Color.RED) + ivMoFangStatus?.drawable?.setTint(Color.RED) + postDelayed({ + ToastUtils.showShort("当前蘑方处理低电状态, 请及时充电") + }, 5000) + } + } else { + if (oldTextColor != Color.WHITE) { + it.setTextColor(Color.WHITE) + ivMoFangStatus?.drawable?.setTint(Color.WHITE) + } + } it.text = "${battery}%" } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_blue_tooth.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_blue_tooth.xml index 1080063127..24e8679ed0 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_blue_tooth.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_blue_tooth.xml @@ -19,10 +19,13 @@ android:id="@+id/ivMoFangBattery" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="12dip" + android:textSize="25dip" + android:textStyle="bold" android:textColor="@color/white" android:layout_gravity="bottom" android:visibility="gone" + android:layout_marginStart="-8dip" + android:layout_marginBottom="1dip" tools:text="18%"/> \ No newline at end of file From 877b3dd768158faa8f1f8a3caeeb2a54bc2baa68 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 30 Aug 2023 12:59:08 +0800 Subject: [PATCH 18/20] =?UTF-8?q?[6.0.0]=20=E5=8F=B8=E6=9C=BA=E7=AB=AF?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=9C=8D=E5=8A=A1=E6=88=90=E5=8A=9F=E5=90=8E?= =?UTF-8?q?,=E5=90=AF=E5=8A=A8=E8=87=AA=E9=A9=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt | 1 - .../src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt index 7d823c9949..51cee6c1a1 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskViewModel.kt @@ -233,7 +233,6 @@ class TaxiCurrentTaskViewModel : BaseViewModel(), override fun onStartAutopilot() { UiThreadHandler.postDelayed({ startTask() //状态流转 - TaxiTaskModel.startAutoPilot() //自驾开启 VoiceNotice.showNotice("车辆正在自动开启自动驾驶") }, TaxiUnmannedConst.START_AUTOPILOT_COUNTDOWN_INTERVAL) // 10s后开启自驾, 状态流转 } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt index 09edff6b75..7b85c8023e 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiTaskModel.kt @@ -841,6 +841,7 @@ object TaxiTaskModel { lineId, object : OchCommonServiceCallback { override fun onSuccess(data: BaseData?) { + startAutoPilot() //自驾开启 d(TAG, "startTask onSuccess: data=${GsonUtil.jsonFromObject(data)}") } From 9bf6d8a05de32bda85bc675e27748a1a4138d90e Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Wed, 30 Aug 2023 13:03:41 +0800 Subject: [PATCH 19/20] =?UTF-8?q?[6.0.0]=20=E5=A2=9E=E5=8A=A0=E9=AB=98?= =?UTF-8?q?=E7=9A=84=E5=AF=BC=E8=88=AA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index 327a135867..5cbdab749e 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -540,6 +540,7 @@ class TaxiCurrentTaskFragment : BaseFragment(), fun updateCurrentTaskTripInfo(meters: Long, timeInSecond: Long) { val currentTaskWithOrder = TaxiTaskModel.getCurrentTaskWithOrder() ?: return if (currentTaskWithOrder.endSite == null && currentTaskWithOrder == null) return + d("NaviToDestinationModel", "taskUitl, ${TaskUtils.getCurrentTaskTripHtml(meters, timeInSecond)}") taskOtherInfo.text = TaskUtils.getCurrentTaskTripHtml(meters, timeInSecond) } From 36f9e25b3c5fcb4d586845853564bbd020428b18 Mon Sep 17 00:00:00 2001 From: aibingbing Date: Wed, 30 Aug 2023 16:20:32 +0800 Subject: [PATCH 20/20] =?UTF-8?q?[Taxi=E6=97=A0=E4=BA=BA=E5=8C=96]=20fix:?= =?UTF-8?q?=20=E6=BC=94=E7=BB=83=E7=B1=BB=E5=9E=8B=E8=AE=A2=E5=8D=95=20?= =?UTF-8?q?=E4=B9=98=E5=AE=A2=E5=B1=8F=E9=A1=B5=E9=9D=A2=E6=B2=A1=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/taxi/passenger/model/TaxiPassengerModel.kt | 11 +++++++---- .../passenger/presenter/BaseTaxiPassengerPresenter.kt | 10 ++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt index 6e5a910e77..31c9433bf2 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.kt @@ -170,8 +170,11 @@ object TaxiPassengerModel { "queryInAndWaitOrders data.taskType=${data.data.taskType}, discard data" ) // 如果上一个是 接驾或送驾任务 下一个是演练任务，需要reset页面状态 - currentOCHOrder = null - orderStatusChange() + if (currentOCHOrder != null) { + currentOCHOrder?.orderStatus = TaxiPassengerOrderStatusEnum.None.code + orderStatusChange() + currentOCHOrder = null + } return } if (data.data?.order == null) { @@ -194,8 +197,8 @@ object TaxiPassengerModel { if (currentOCHOrder?.orderStatus == TaxiPassengerOrderStatusEnum.UserArriveAtStart.code && currentOrder.orderStatus < TaxiPassengerOrderStatusEnum.UserArriveAtStart.code ) { - // 0830 UserArriveAtStart 状态是乘客屏本地在用户验证后本地设置，而且因为后端查询数据有延迟 - // 这里过下过滤，如果当前是UserArriveAtStart 且后端返回是之前状态，不更新数据 + // 0830 UserArriveAtStart 状态是乘客屏本地在用户验证后本地设置，而且因为后端查询数据有延迟 + // 这里过下过滤，如果当前是UserArriveAtStart 且后端返回是之前状态，不更新数据 } else { currentOCHOrder = currentOrder orderStatusChange() diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt index 88c3ad387a..185ba822d9 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.kt @@ -66,6 +66,14 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : order?.let { setItineraryVisibility() when (TaxiPassengerModel.curOrderStatus) { + TaxiPassengerOrderStatusEnum.OnTheWayToStart -> { + // 10 接驾中 + mView?.showOrHideStartAutopilotView(isShow = false) + mView?.showOrHidePressengerCheckPager(isShow = false) + mView?.showOrHideArrivedEndLayout(isShow = false) + overMapViewClear() + } + TaxiPassengerOrderStatusEnum.ArriveAtStart -> { // 20 司机到达上车点 mView?.showOrHideArrivedEndLayout(isShow = false) @@ -104,6 +112,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : mView?.showOrHideArrivedEndLayout(false) overMapViewClear() } + TaxiPassengerOrderStatusEnum.Cancel -> { // 70 取消订单 mView?.showOrHideStartAutopilotView(isShow = false) @@ -111,6 +120,7 @@ class BaseTaxiPassengerPresenter(view: TaxiPassengerBaseFragment?) : mView?.showOrHideArrivedEndLayout(isShow = false) overMapViewClear() } + TaxiPassengerOrderStatusEnum.None -> { // 00 默认状态，在不同任务之间切换时使用 mView?.showOrHideStartAutopilotView(isShow = false)