Merge branch 'dev_minibus-d_230425_3.2.0' of gitlab.zhidaoauto.com:SCA/L4HA/AndroidApp/MoGoEagleEye into dev_minibus-d_230425_3.2.0

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

@@ -95,12 +95,6 @@ class DriverMonitorView :
         sopShowDriverMap["20211112X2RI32A"] = "F803EB2046PZD00274"//京A40776D
         sopShowDriverMap["202204085X310A1"] = "F803EB2046PZD00263"//湘D09005D
 
-        Logger.d(TAG, "getServerToken = ${CallerTelematicManager.getServerToken()}")
-
-        liveListener?.showOrHideLiveBtn(
-            sopShowDriverMap.containsKey(CallerTelematicManager.getServerToken())
-        )
-
         // TODO SOP演示需求，只有乘客屏幕才会触发这个逻辑 END
         // 点击重新连接直播
         ivNormal.setOnClickListener {
@@ -110,6 +104,9 @@ class DriverMonitorView :
         mHandler.postDelayed(mRunnable, 1000) // 1 second delay
     }
 
+    fun isSOPDriverSn(sn: String) :Boolean{
+        return sopShowDriverMap.containsKey(sn)
+    }
 
     override fun onDetachedFromWindow() {
         super.onDetachedFromWindow()
@@ -213,7 +210,6 @@ class DriverMonitorView :
 
     interface LiveListener {
         fun onPlayError()
-        fun showOrHideLiveBtn(isShow: Boolean)
     }
 
 }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/view/SmallMapView.kt

@@ -140,8 +140,6 @@ class SmallMapView @JvmOverloads constructor(
 
     @UiThread
     fun clearPolyline() {
-        CallerLogger.d(
-            SceneConstant.M_MAP + TAG, "SmallMapView  clearPolyline mPolyline -----> ")
         if (mPolyline != null) {
             mPolyline!!.remove()
             mPolyline = null
@@ -325,8 +323,6 @@ class SmallMapView @JvmOverloads constructor(
         val tempStatus = autoPilotStatusInfo.pilotmode
         if (tempStatus != 1) {
             UiThreadHandler.post {
-                CallerLogger.d(
-                    SceneConstant.M_MAP + TAG, "onAutopilotStatusResponse tempStatus = $tempStatus ---clearPolyline() ")
                 clearPolyline()
             }
         } else if (tempStatus == 1 && autoPilotStatus == 0) {