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

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/bone/tab/CarInfoTabView.kt

@@ -177,7 +177,6 @@ class CarInfoTabView @JvmOverloads constructor(
     override fun invokeCarNo(no: String?) {
         super.invokeCarNo(no)
         UiThreadHandler.post {
-            // 监听工控的车牌信息，防止调试跳过无车牌内容(链接先后顺序不一致也会导致数据显示异常)
             if (!no.isNullOrEmpty()) {
                 if (tvCarNo.text.isNotEmpty() && tvCarNo.text == no) {
                     CallerLogger.i("$M_HMI$TAG", "已存在车牌号")

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt

@@ -14,6 +14,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoColdStartStateListener
+import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotControlManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerColdStartStateListenerManager
 import com.mogo.eagle.core.function.hmi.R
@@ -74,13 +75,17 @@ class ColdStartView @JvmOverloads constructor(
     }
 
     private fun initView(){
-
+        tvSystemStartupTitle.setOnLongClickListener {
+            hideColdStartView()
+            true
+        }
     }
 
     override fun onAttachedToWindow() {
         super.onAttachedToWindow()
         CallerAutoPilotStatusListenerManager.addListener(TAG, this)
         CallerColdStartStateListenerManager.addListener(TAG,this)
+        CallerAutoPilotControlManager.sendSsmFuncQueryColdStartState()
     }
 
     override fun onDetachedFromWindow() {
@@ -316,6 +321,8 @@ class ColdStartView @JvmOverloads constructor(
         viewColdStartDivider.visibility = View.GONE
         ivColdStartStatus.visibility = View.GONE
         tvColdStartContent.visibility = View.GONE
+        //主动查询冷启动状态
+        CallerAutoPilotControlManager.sendSsmFuncQueryColdStartState()
     }
 
     /**
@@ -374,6 +381,8 @@ class ColdStartView @JvmOverloads constructor(
         }
         ssmConnectStatus = true
         coldStartStatus = false
+        //主动查询冷启动状态
+        CallerAutoPilotControlManager.sendSsmFuncQueryColdStartState()
     }
 
     /**
@@ -491,10 +500,13 @@ class ColdStartView @JvmOverloads constructor(
      * 隐藏冷启动视图
      */
     private fun hideColdStartView(){
-        UiThreadHandler.postDelayed({
-            this@ColdStartView.visibility = View.GONE
-            coldStartResultListener?.coldStartSuccess()
-        }, 2000)
+//        UiThreadHandler.postDelayed({
+//            this@ColdStartView.visibility = View.GONE
+//            coldStartResultListener?.coldStartSuccess()
+//        }, 2000)
+        // 假设view是你想要淡出的视图
+        this@ColdStartView.animate().alpha(0.0f).setDuration(1000).start()
+        coldStartResultListener?.coldStartSuccess()
     }
 
     /**

core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/autopilot/AutopilotControlParameters.kt

@@ -255,6 +255,8 @@ class AutopilotControlParameters {
                 "routeID=$routeID, " +
                 "routeName='$routeName', " +
                 "isSpeakVoice=$isSpeakVoice, " +
+                "orderId=$orderId, " +
+                "firstAutopilotFlag=$firstAutopilotFlag, " +
                 "autoPilotLine=$autoPilotLine)"
     }