Merge branch 'refs/heads/dev_robotaxi-d_240912_6.7.0' into dev_robotaxi-d_240912_6.7.2_local

# Conflicts: # OCH/shuttle/passenger/src/main/java/jinlv/com/mogo/och/shuttle/passenger/model/BusPassengerModel.java # OCH/shuttle/passenger/src/main/java/m2/com/mogo/och/shuttle/passenger/model/PM2DrivingModel.kt
2024-10-23 18:07:24 +08:00
parent 535fde1cf3 1fb1d517ce
commit eea89a6c03
14 changed files with 238 additions and 112 deletions
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/badcase/BadCaseManager.kt
@@ -377,31 +377,29 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
    fun onReceiveBadCaseRecord(msgBoxBean: MsgBoxBean, activity: Activity, countdown: Boolean) {
        CallerLogger.d("$M_DEVA$TAG", "收到录包结果回调${record}")
        CallerLogger.d("$M_DEVA$TAG", "开始创建被动录包弹窗,window num=${BadCaseConfig.windowNum}")
-        if(!ProjectUtils.isSaas()){
-            ThreadUtils.runOnUiThread {
-                val passiveBadCaseWindow = PassiveBadCaseWindow(activity)
-                passiveBadCaseWindow.setRecord(msgBoxBean)
-                passiveBadCaseWindow.setClickListener(object : PassiveBadCaseWindow.ClickListener {
-                    override fun closeWindow() {
-                        passiveBadCaseWindow.hideFloatWindow()
-                    }
-                })
-                passiveBadCaseWindow.showFloatWindow()
-                if (countdown) {
-                    val countDownTimer = object : CountDownTimer(10000, 10000) {
-                        override fun onTick(p0: Long) {
-                        }
-
-                        override fun onFinish() {
-                            //如果有页面操作，则不自动关闭窗口
-                            if(!passiveBadCaseWindow.isOperated()){
-                                passiveBadCaseWindow.hideFloatWindow()
-                                BadCaseConfig.windowNum--
-                            }
-                        }
-                    }
-                    countDownTimer.start()
+        ThreadUtils.runOnUiThread {
+            val passiveBadCaseWindow = PassiveBadCaseWindow(activity)
+            passiveBadCaseWindow.setRecord(msgBoxBean)
+            passiveBadCaseWindow.setClickListener(object : PassiveBadCaseWindow.ClickListener {
+                override fun closeWindow() {
+                    passiveBadCaseWindow.hideFloatWindow()
                }
+            })
+            passiveBadCaseWindow.showFloatWindow()
+            if (countdown) {
+                val countDownTimer = object : CountDownTimer(10000, 10000) {
+                    override fun onTick(p0: Long) {
+                    }
+
+                    override fun onFinish() {
+                        //如果有页面操作，则不自动关闭窗口
+                        if(!passiveBadCaseWindow.isOperated()){
+                            passiveBadCaseWindow.hideFloatWindow()
+                            BadCaseConfig.windowNum--
+                        }
+                    }
+                }
+                countDownTimer.start()
            }
        }
    }
@@ -469,6 +467,7 @@ internal object BadCaseManager : LifecycleEventObserver, IMoGoAutopilotRecordLis
        if (!FunctionBuildConfig.isDemoMode && (recordPanel.stat == 100 || recordPanel.stat == 101) && recordPanel.type != 2) {
            //只在司机屏生效，乘客屏不生效
            if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+
                CallerMsgBoxManager.saveMsgBox(
                    MsgBoxBean(
                        MsgBoxType.RECORD, RecordBagMsg(
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartManager.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/coldstart/ColdStartManager.kt
@@ -2,12 +2,14 @@ package com.zhjt.mogo_core_function_devatools.coldstart

 import android.content.Context
 import android.util.Log
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizListener
 import com.mogo.eagle.core.function.api.och.IOchFunctionCallNotify
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.datacenter.CallerDataCenterBizListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils
 import com.mogo.eagle.core.utilcode.util.TimeUtils.millis2String
 import com.zhjt.mogo.adas.data.AdasConstants
@@ -44,23 +46,26 @@ object ColdStartManager: IMoGoAutopilotStatusListener, IDataCenterBizListener {
        status: AdasConstants.IpcConnectionStatus,
        reason: String?
    ){
-        //域控连接异常
-        if(status != AdasConstants.IpcConnectionStatus.CONNECTED){
-            //当前进入主页方式为立即用车，则在主页面不再展示冷启动页面
-            if(isColdStartNow && !isColdStartSuccess){
-                return
-            }
-            if(isColdStartNow && ColdStartConfig.getColdStartNowTime() > ColdStartConfig.getColdStartSuccessTime()){
-                return
-            }
-            //已登录且距离上次冷启动成功超过1分钟，再次展示冷启动页面
-            if(!ColdStartConfig.getShowWindowStatus() && loginStatus && System.currentTimeMillis().minus(ColdStartConfig.getColdStartSuccessTime())>60000){
-                if(System.currentTimeMillis().minus(ipcConnectedTime) > 60000){
-                    CallerHmiManager.showColdStartWindow()
+        //冷启动只上司机屏
+        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            //域控连接异常
+            if(status != AdasConstants.IpcConnectionStatus.CONNECTED){
+                //当前进入主页方式为立即用车，则在主页面不再展示冷启动页面
+                if(isColdStartNow && !isColdStartSuccess){
+                    return
                }
+                if(isColdStartNow && ColdStartConfig.getColdStartNowTime() > ColdStartConfig.getColdStartSuccessTime()){
+                    return
+                }
+                //已登录且距离上次冷启动成功超过1分钟，再次展示冷启动页面
+                if(!ColdStartConfig.getShowWindowStatus() && loginStatus && System.currentTimeMillis().minus(ColdStartConfig.getColdStartSuccessTime())>60000){
+                    if(System.currentTimeMillis().minus(ipcConnectedTime) > 60000){
+                        CallerHmiManager.showColdStartWindow()
+                    }
+                }
+            }else{
+                ipcConnectedTime = System.currentTimeMillis()
            }
-        }else{
-            ipcConnectedTime = System.currentTimeMillis()
        }
    }

--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/DriverMsgBoxBubbleView.kt
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.mogo.commons.env.ProjectUtils
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.data.enums.DataSourceType
@@ -114,12 +115,15 @@ class DriverMsgBoxBubbleView @JvmOverloads constructor(
            if (isShowData) {
                if (category == MsgCategory.RECORD_BAG) {
                    if (!FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isShowBagRecordWindow) {
-                        //弹出被动录包弹窗
-                        CallerDevaToolsManager.onReceiveBadCaseRecord(
-                            msgBoxBean,
-                            context as Activity,
-                            true
-                        )
+                        //660开始saas环境下原有的接管录包弹窗不弹了，其他环境下还弹
+                        if(!ProjectUtils.isSaas()){
+                            //弹出被动录包弹窗
+                            CallerDevaToolsManager.onReceiveBadCaseRecord(
+                                msgBoxBean,
+                                context as Activity,
+                                true
+                            )
+                        }
                        CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
                    }
                } else if (category == MsgCategory.SYS_INFO) {
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/msgbox/MsgBoxToastView.kt
@@ -7,6 +7,7 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.mogo.commons.env.ProjectUtils
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.deva.report.ReportEntity
 import com.mogo.eagle.core.data.enums.DataSourceType
@@ -102,12 +103,15 @@ class MsgBoxToastView @JvmOverloads constructor(
            if (isShowData) {
                if (category == MsgCategory.RECORD_BAG) {
                    if (!FunctionBuildConfig.isDemoMode && FunctionBuildConfig.isShowBagRecordWindow) {
-                        //弹出被动录包弹窗
-                        CallerDevaToolsManager.onReceiveBadCaseRecord(
-                            msgBoxBean,
-                            context as Activity,
-                            true
-                        )
+                        //660开始saas环境下原有的接管录包弹窗不弹了，其他环境下还弹
+                        if(!ProjectUtils.isSaas()){
+                            //弹出被动录包弹窗
+                            CallerDevaToolsManager.onReceiveBadCaseRecord(
+                                msgBoxBean,
+                                context as Activity,
+                                true
+                            )
+                        }
                        CallerMsgBoxEventListenerManager.invokeUpdateTipListener(true)
                    }
                } else if (category == MsgCategory.SYS_INFO) {
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/preferences/PreferenceWithSpeedSetting.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/operate/preferences/PreferenceWithSpeedSetting.kt
@@ -2,23 +2,18 @@ package com.mogo.eagle.core.function.hmi.ui.operate.preferences

 import android.annotation.SuppressLint
 import android.content.Context
-import android.text.Editable
 import android.util.AttributeSet
 import android.widget.EditText
 import android.widget.TextView
 import androidx.core.widget.doAfterTextChanged
-import androidx.core.widget.doBeforeTextChanged
-import androidx.core.widget.doOnTextChanged
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.kotlin.onClickWidthDuration
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import java.math.BigDecimal
 import java.util.concurrent.ConcurrentHashMap
-import kotlin.math.max

 class PreferenceWithSpeedSetting : Preference {

@@ -74,7 +69,7 @@ class PreferenceWithSpeedSetting : Preference {
        if (cache.containsKey(key)) {
            cur = cache[key] ?: cur
        }
-        cur = BigDecimal.valueOf(cur).setScale(1).toDouble()
+        cur = cur.safeScale()
        if (speedLimit is EditText) {
            speedLimit.setText(cur.toString())
            speedLimit.doAfterTextChanged { text ->
@@ -89,14 +84,13 @@ class PreferenceWithSpeedSetting : Preference {
                    btnOk.isEnabled = false
                    holder.itemView.isEnabled =  false
                    ll.isSelected = false
-                    ToastUtils.showShort("阈值最大为${BigDecimal.valueOf(max).setScale(1)}$unit")
+                    ToastUtils.showShort("阈值最大为${max.safeScale()}$unit")
                    return@doAfterTextChanged
                }
-                val temp = BigDecimal.valueOf(current).setScale(1).toDouble()
+                val temp = current.safeScale()
                if (cur == temp) {
                    return@doAfterTextChanged
                }
-                Logger.d("RWJ", "--- cache ---- 2 ---: $cur, $temp")
                cur = temp
                btnOk.isEnabled = true
                ll.isSelected = true
@@ -115,7 +109,7 @@ class PreferenceWithSpeedSetting : Preference {
        minus.onClickWidthDuration(100) {
            val minusAfter = cur - step
            if (minusAfter < min) {
-                ToastUtils.showShort("阈值最小为${BigDecimal.valueOf(min).setScale(1)}$unit")
+                ToastUtils.showShort("阈值最小为${min.safeScale()}$unit")
                return@onClickWidthDuration
            }
            cur = minusAfter
@@ -135,7 +129,7 @@ class PreferenceWithSpeedSetting : Preference {
        add.onClickWidthDuration(100) {
            val addAfter = cur + step
            if (addAfter > max) {
-                ToastUtils.showShort("阈值最大为${BigDecimal.valueOf(max).setScale(1)}$unit")
+                ToastUtils.showShort("阈值最大为${max.safeScale()}$unit")
                return@onClickWidthDuration
            }
            holder.itemView.isEnabled = false
@@ -159,4 +153,8 @@ class PreferenceWithSpeedSetting : Preference {
            }
        }
    }
+
+    private fun Double.safeScale(s: Int = 1): Double {
+        return runCatching { BigDecimal.valueOf(this).setScale(s).toDouble() }.getOrNull() ?: this
+    }
 }
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/viewport/VisualAngleToggleView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/viewport/VisualAngleToggleView.kt
@@ -39,21 +39,30 @@ class VisualAngleToggleView : FrameLayout, IMoGoVisualAngleChangeProvider.OnMoGo
        val defaultSlop = AutoSizeUtils.dp2px(context, 12.0f)
        val scrollSlop = max(context.let { ViewConfiguration.get(it).scaledTouchSlop }, defaultSlop)
        val gestureDetector = GestureDetector(context, object : GestureDetector.SimpleOnGestureListener() {
+
+            private var flag = false
+
            override fun onDown(e: MotionEvent): Boolean {
+                flag = false
                return true
            }

            override fun onScroll(e1: MotionEvent, e2: MotionEvent, distanceX: Float, distanceY: Float): Boolean {
+                if (flag) {
+                    return super.onScroll(e1, e2, distanceX, distanceY)
+                }
                val absX = abs(e2.x - e1.x)
                val absY = abs(e2.y - e1.y)
                if (absY <= absX) {
                    return false
                }
                if (e2.y - e1.y >= scrollSlop) {
+                    flag = true
                    moveToBottom()
                    return true
                }
                if (e1.y - e2.y >= scrollSlop) {
+                    flag = true
                    moveToTop()
                    return true
                }
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/angle/MoGoVisualAngleChangeProvider.kt
@@ -43,7 +43,6 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {

    private val prevScene by lazy { AtomicReference<Scene>() }

-    private var timerJob: Job? = null

    private val listener = object : IMoGoMapRoadListener {
        private val roadId = AtomicReference<String>()
@@ -207,23 +206,7 @@ class MoGoVisualAngleChangeProvider: IMoGoVisualAngleChangeProvider {
                    DOWN -> CallerMapUIServiceManager.getMapUIController()?.setScreenToOriginDis(5.0f)
                }
                if (target !is Roma) {
-                    if (target is LongSight) {
-                        timerJob?.safeCancel()
-                        scope.launch {
-                            CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(false)
-                            itx.changeMapVisualAngle(angle, null)
-                            delay(3000)
-                            CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(true)
-                        }.also {
-                            it.invokeOnCompletion {
-                                CallerMapUIServiceManager.getMapUIController()?.setAllGesturesEnabled(true)
-                            }
-                            timerJob = it
-                        }
-                    } else {
-                        timerJob?.safeCancel()
-                        itx.changeMapVisualAngle(angle, null)
-                    }
+                    itx.changeMapVisualAngle(angle, null)
                }
            } finally {
                if (prev == null || prev.javaClass != target.javaClass) {