Merge branch 'dev_robobus-d_230322_3.0.0' into 'dev_robobus-p_230322_2.0.0'

Dev robobus d 230322 3.0.0 See merge request SCA/L4HA/AndroidApp/MoGoEagleEye!751
2023-04-10 11:43:09 +00:00
parent 6b8b0f89a2 9ae98eb279
commit e6ed1c6533
12 changed files with 46 additions and 14 deletions
--- 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)
 }
--- 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<DriverM1Fragment?, DriverM1Presente
        }.start()
    }

-    private fun clearCountDownTimer() {
+    fun clearCountDownTimer() {
        if (countDownTimer != null){
            countDownTimer?.cancel()
            countDownTimer = null
--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/model/DriverM1Model.kt
@@ -517,6 +517,7 @@ class DriverM1Model {
            DriverM1LooperManager.starCountDownLoop()
        }else{
            DriverM1LooperManager.stopCountDownLoop()
+            mOrderCallback?.clearCountDown()
        }
    }

--- a/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
+++ b/OCH/mogo-och-charter/src/driverm1/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt
@@ -105,6 +105,10 @@ class DriverM1Presenter(view: DriverM1Fragment?) :
        mView?.updateCountDown(minutes)
    }

+    override fun clearCountDown() {
+        mView?.clearCountDownTimer()
+    }
+
    override fun updateReturnCarStatus(returnSuccess: Boolean) {
        mView?.updateReturnCarStatus(returnSuccess)
    }
--- 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
--- 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)
                }
            }

--- 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
@@ -7,10 +7,15 @@ import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.enums.EventTypeEnumNew
+import com.mogo.eagle.core.data.msgbox.MsgBoxBean
+import com.mogo.eagle.core.data.msgbox.MsgBoxType
+import com.mogo.eagle.core.data.msgbox.V2XMsg
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
+import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager.saveMsgBox
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.zhjt.mogo.adas.data.bean.MogoReport
@@ -63,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() {
--- 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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_393"
+    android:layout_width="@dimen/dp_400"
    android:layout_height="@dimen/dp_80"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:background="#CCFFFFFF"
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_operation.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_operation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mogo.eagle.core.widget.RoundConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_393"
+    android:layout_width="@dimen/dp_400"
    android:layout_height="@dimen/dp_80"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:background="#CCFFFFFF"
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_v2x.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_m_box_v2x.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.mogo.eagle.core.widget.RoundCanClickConstraintLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/dp_393"
+    android:layout_width="@dimen/dp_400"
    android:layout_height="@dimen/dp_80"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:background="#CCFFFFFF"
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_box_bubble.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/layout_m_box_bubble.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/rvMBoxBubbleList"
-    android:layout_width="@dimen/dp_393"
+    android:layout_width="@dimen/dp_400"
    android:layout_height="wrap_content"
    >

--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
@@ -107,9 +107,14 @@ enum class EventTypeEnumNew(
        "前方盲区行人通行，请注意", "前方盲区即将有行人通过，请减速慢行"),

    //接管
+//    TAKE_OVER_EVENT(
+//        "20000", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over,
+//        "注意周围、立即接管", "自动驾驶退出请立即接管"
+//    ),
+
    TAKE_OVER_EVENT(
        "20000", "接管", "注意周围、立即接管", R.drawable.icon_warning_take_over,
-        "注意周围、立即接管", "自动驾驶退出请立即接管"
+        "注意周围、立即接管", "平行驾驶遇弱网已退出，注意随时接管"
    ),

    // 前方静止or慢速车辆报警