Merge branch 'test_robotaxi-d-app-module_2110_220915_2.11.0.1' into dev_robotaxi-d-app-module_2120_221017_2.12.0

# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java

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

@@ -9,7 +9,6 @@ import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.text.TextUtils
 import android.transition.*
-import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.view.WindowManager
@@ -866,7 +865,7 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
             AIAssist.getInstance(ctx).speakTTSVoice(text, voiceCallback)
         } catch (t: Throwable) {
             it.resumeWith(Result.success(Unit))
-            Logger.e(TAG, t.message)
+            CallerLogger.d("$M_HMI$TAG", t.message)
         }
     }
 
@@ -1458,7 +1457,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
      * 工控机监控节点上报
      */
     override fun onAutopilotGuardian(guardianInfo: MogoReportMsg.MogoReportMessage?) {
-        Log.d("EmArrow-1013", "onAutopilotGuardian : $guardianInfo , takeOver : $takeOver")
         ThreadUtils.runOnUiThread {
             guardianInfo?.let {
                 if (reportList.size > 49) {
@@ -1484,10 +1482,6 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                     EXIT_AUTOPILOT_FOR_LOCATION,
                     EXIT_AUTOPILOT_FOR_CHASSIS,
                     EXIT_AUTOPILOT_FOR_DISTANCE -> {
-                        Log.d(
-                            "EmArrow-1013",
-                            "it code : ${it.code} ,  state : ${getAutoPilotStatusInfo().state}"
-                        )
                         showWarningV2X(
                             EventTypeEnum.TAKE_OVER_EVENT.poiType,
                             EventTypeEnum.TAKE_OVER_EVENT.content,
@@ -1495,13 +1489,11 @@ class MoGoHmiFragment : MvpFragment<MoGoHmiContract.View?, HmiPresenter?>(),
                             EventTypeEnum.TAKE_OVER_EVENT.poiType,
                             object : IMoGoWarningStatusListener {
                                 override fun onShow() {
-                                    Log.d("EmArrow-1013", "onShow")
                                     takeOver = true
                                     clTakeOverView.visibility = View.VISIBLE
                                 }
 
                                 override fun onDismiss() {
-                                    Log.d("EmArrow-1013", "onDismiss")
                                     takeOver = false
                                     clTakeOverView.visibility = View.GONE
                                 }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -623,7 +623,6 @@ class DebugSettingView @JvmOverloads constructor(
 
         // 强制绘制引导线
         tbIsDrawAutopilotTrajectoryData.setOnCheckedChangeListener { _, isChecked ->
-            Logger.d("Route", "DebugSettingView -> initView2 ==> isDemoMode:" + FunctionBuildConfig.isDemoMode + ",isIgnore: $isChecked")
             FunctionBuildConfig.isIgnoreConditionsDrawAutopilotTrajectoryData = isChecked
         }
 

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

@@ -1,17 +1,17 @@
 package com.mogo.eagle.core.function.hmi.ui.widget
 
 import android.content.Context
-import android.graphics.Color
+import android.graphics.*
 import android.location.Location
-import android.util.AttributeSet
+import android.util.*
 import android.view.Gravity
 import android.widget.FrameLayout
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
-import com.mogo.map.MogoMapUIController
+import com.mogo.eagle.core.utilcode.util.*
+import com.mogo.map.*
 import com.mogo.map.navi.IMogoCarLocationChangedListener2
 import com.mogo.service.IMogoServiceApis
 import java.util.*
@@ -38,6 +38,11 @@ class SpeedPanelView @JvmOverloads constructor(
 
     var mSpeedLimmit = 60;
 
+
+    private val timer by lazy {
+        Timer()
+    }
+
     init {
         initEvent(context)
 
@@ -61,29 +66,30 @@ class SpeedPanelView @JvmOverloads constructor(
         }
     }
 
-    private val timerTask = object : TimerTask() {
-        override fun run() {
-            if (mLatLng != null) {
-                mSpeedLimmit = MogoMapUIController.getInstance()
-                    .getLimitSpeed(mLatLng!!.longitude, mLatLng!!.latitude, mLatLng!!.bearing)
-                UiThreadHandler.post {
-                    val speed = (mLatLng!!.speed * 3.6f).toInt()
-                    mSpeedChartView.setArcColor(Color.parseColor(if (speed > mSpeedLimmit) "#DB3137" else "#3E77F6"))
-                    mSpeedChartView.setValues(speed)
-                    setBackgroundResource(if (speed > mSpeedLimmit) R.drawable.yi_biao_pan_bg_speeding else R.drawable.yi_biao_pan_bg_nor)
+    private var timerTask : TimerTask? = null
+
+    override fun onAttachedToWindow() {
+        super.onAttachedToWindow() // 注册位置回调
+        mMogoServiceApis.registerCenterApi.registerCarLocationChangedListener(TAG, this)
+        // 开启定时查询速度
+        timerTask?.cancel()
+        val task = object : TimerTask() {
+            override fun run() {
+                if (mLatLng != null) {
+
+                    mSpeedLimmit = MogoMapUIController.getInstance()
+                        .getLimitSpeed(mLatLng!!.longitude, mLatLng!!.latitude, mLatLng!!.bearing)
+                    UiThreadHandler.post {
+                        val speed = (mLatLng!!.speed * 3.6f).toInt()
+                        mSpeedChartView.setArcColor(Color.parseColor(if (speed > mSpeedLimmit) "#DB3137" else "#3E77F6"))
+                        mSpeedChartView.setValues(speed)
+                        setBackgroundResource(if (speed > mSpeedLimmit) R.drawable.yi_biao_pan_bg_speeding else R.drawable.yi_biao_pan_bg_nor)
+                    }
                 }
             }
         }
-    }
-
-    override fun onAttachedToWindow() {
-        super.onAttachedToWindow()
-        // 注册位置回调
-        mMogoServiceApis.registerCenterApi
-            .registerCarLocationChangedListener(TAG, this)
-
-        // 开启定时查询速度
-        Timer().schedule(timerTask, Date(), 100)
+        this.timerTask = task
+        timer.schedule(task, Date(), 100)
     }
 
     override fun onDetachedFromWindow() {
@@ -92,7 +98,7 @@ class SpeedPanelView @JvmOverloads constructor(
         mMogoServiceApis.registerCenterApi
             .unregisterMogoLocationListener(TAG)
         try {
-            timerTask.cancel()
+            timerTask?.cancel()
         } catch (e: Exception) {
             e.printStackTrace()
         }

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

@@ -16,7 +16,6 @@ import com.mogo.eagle.core.function.call.bindingcar.CallerBindingCarListenerMana
 import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_HMI
 import com.mogo.eagle.core.utilcode.util.AppUtils
 import com.mogo.eagle.core.utilcode.util.ThreadUtils