Merge branch 'dev_robobus-d_241202_6.8.4' into dev_robotaxi-d_241210_6.9.0

# Conflicts:
#	OCH/offline/driver/src/main/java/com/mogo/och/offline/model/OrderModel.java

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

@@ -338,6 +338,7 @@ import kotlin.collections.set
 import kotlin.math.abs
 import kotlin.system.exitProcess
 import com.mogo.eagle.core.function.hmi.ui.tools.ShowDevicesManagerStateDialog
+import kotlinx.android.synthetic.main.view_debug_setting.view.tbTileFileLog
 
 
 /**
@@ -1188,6 +1189,24 @@ internal class DebugSettingView @JvmOverloads constructor(
             CallerMapUIServiceManager.getMapUIController()?.setIsDrawPointCloud(isChecked)
             CallerSopSettingManager.invokePointCloudListener(isChecked)
         }
+        tbTileFileLog.setOnCheckedChangeListener { compoundButton, isChecked ->
+            if (!compoundButton.isPressed) {
+                return@setOnCheckedChangeListener
+            }
+            mogoMapData.get()?.let { map ->
+                if (isChecked) {
+                    if (!map.isTileFileLogOpen()) {
+                        map.openTileFileLog(true)
+                        map.listenTileFileLog()
+                    }
+                } else {
+                    if (map.isTileFileLogOpen()) {
+                        map.openTileFileLog(false)
+                        map.stopListenTileFileLog()
+                    }
+                }
+            }
+        }
 
         //设置点云大小
         btnPointCloudSize.setOnClickListener {

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -1904,6 +1904,22 @@
                         app:layout_constraintRight_toRightOf="@id/tbChangeAutoPilotStatus"
                         app:layout_constraintTop_toBottomOf="@id/tbChangeAutoPilotStatus"
                         />
+
+                    <ToggleButton
+                        android:id="@+id/tbTileFileLog"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
+                        android:padding="@dimen/dp_20"
+                        android:textColor="#000"
+                        android:textOff="开启地图瓦片日志"
+                        android:textOn="关闭地图瓦片日志"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintLeft_toRightOf="@id/tbDrawPointCloudData"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/tbCarAperture"
+                        />
+
                     <Button
                         android:id="@+id/btnPointCloudSize"
                         android:layout_width="wrap_content"

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_status_bar.xml

@@ -17,8 +17,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginStart="@dimen/dp_61"
-            android:format12Hour="HH:mm"
-            android:format24Hour="HH:mm"
+            android:format12Hour="HH:mm:ss"
+            android:format24Hour="HH:mm:ss"
             android:textColor="#ffffff"
             android:textSize="@dimen/dp_45"
             android:textStyle="bold" />