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

# Conflicts: # OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/LoadingMapStatusView.kt
2024-10-29 17:49:38 +08:00
parent 80db26c489 3e41bb5fa0
commit 019d9b7314
15 changed files with 106 additions and 16 deletions
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
@@ -1726,7 +1726,7 @@ class TravelRealityView @JvmOverloads constructor(
                    hideStartEndMarker()
                }
            } else {
-                drawStartEndMarker(emptyList())
+                drawStartEndMarker(ArrayList())
            }
        }
    }