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

# Conflicts:
#	OCH/common/biz/src/main/java/com/mogo/och/biz/login/ui/LoginFragment.kt

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

@@ -583,9 +583,17 @@ class FaultReasonView @JvmOverloads constructor(
             reportNote = "" //上报描述
             tvUploadSuccess.visibility = View.GONE
             faultReasonGroup.visibility = View.VISIBLE
-        }else{
-            CallerDevaToolsListenerManager.removeListener(TAG)
         }
     }
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        CallerDevaToolsListenerManager.addListener(TAG, this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerDevaToolsListenerManager.removeListener(TAG)
+    }
+
 }

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

@@ -364,10 +364,17 @@ class WorkOrderView @JvmOverloads constructor(
             setAudio(false)
             //重置工单问题类型
             workOrderType = ""
-        }else{
-            CallerDevaToolsListenerManager.removeListener(TAG)
         }
+    }
 
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow()
+        CallerDevaToolsListenerManager.addListener(TAG, this)
+    }
+
+    override fun onDetachedFromWindow() {
+        super.onDetachedFromWindow()
+        CallerDevaToolsListenerManager.removeListener(TAG)
     }
 
 }

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

@@ -633,7 +633,7 @@ class ColdStartView @JvmOverloads constructor(
         fun coldStartFail()
     }
 
-    fun setColdStartResultListener(listener: ColdStartResultListener){
+    fun setColdStartResultListener(listener: ColdStartResultListener?){
         coldStartResultListener = listener
     }