Merge branch 'release_robobus-d_230413_3.1.0.1'

# Conflicts:
#	OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java
#	OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/SweeperFragment.java
#	core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/AppIdentityModeUtils.kt
#	gradle.properties

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt

@@ -65,10 +65,10 @@ object TrackerSourceColorHelper {
 
         //僵尸车
         if(data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE){
-            color = "#AD7488FF"
+            color = "#7A8499FF"
             CallerMapUIServiceManager.getMapUIController()?.let {
                 if(it.isDayMode){
-                    color = "#AE7887FF"
+                    color = "#9BA8BCFF"
                 }
             }
         }

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

@@ -112,8 +112,8 @@ class MapBizView(context: Context?, attrs: AttributeSet?) : MogoMapView(context,
     private fun turn(lightNum: Int) {
         if (currentLevel != lightNum) {
             when (lightNum) {
-                0 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(3, 500)
-                1 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(4, 500)
+                0 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(0, 500)
+                1 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(1, 500)
                 2 -> CallerMapUIServiceManager.getMapUIController()?.setCarLightsType(2, 500)
             }
             currentLevel = lightNum

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

@@ -145,6 +145,7 @@ class OverMapView @JvmOverloads constructor(
             topPadding = typedArray.getInt(R.styleable.OverMapView_topPadding, 100)
             rightPadding = typedArray.getInt(R.styleable.OverMapView_rightPadding, 100)
             bottomPadding = typedArray.getInt(R.styleable.OverMapView_bottomPadding, 100)
+            mTilt = typedArray.getFloat(R.styleable.OverMapView_mapTilt, 30f)
             typedArray.recycle()
             initView(context)
         } catch (e: Exception) {
@@ -215,6 +216,25 @@ class OverMapView @JvmOverloads constructor(
         siteMarkerList = mAMap!!.addMarkers(markerOptionsList, false)
     }
 
+    @MainThread
+    fun drawSiteMarkers(
+        siteMarkers: List<SiteMarkerBean>?,
+    ) {
+        if (siteMarkers.isNullOrEmpty()) return
+        clearSiteMarkers()
+        val markerOptionsList = ArrayList<MarkerOptions>()
+        for (siteMarkerBean in siteMarkers) {
+            val markerOption = MarkerOptions()
+            markerOption.position(siteMarkerBean.latLng)
+            markerOption.anchor(siteMarkerBean.anchorX, siteMarkerBean.anchorY)
+            markerOption.icon(
+                BitmapDescriptorFactory.fromBitmap(siteMarkerBean.bitmap)
+            )
+            markerOptionsList.add(markerOption)
+        }
+        siteMarkerList = mAMap!!.addMarkers(markerOptionsList, false)
+    }
+
     @MainThread
     fun clearSiteMarkers() {
         if (siteMarkerList != null) {
@@ -277,7 +297,6 @@ class OverMapView @JvmOverloads constructor(
 
     private fun initAMapView(context: Context) {
         Log.d(TAG, "initAMapView")
-        mTilt = 30f
         mCameraUpdate = CameraUpdateFactory.zoomTo(zoomLevel.toFloat())
         mAMap = mMapView!!.map
         mCustomMapStyleOptions = CustomMapStyleOptions()

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

@@ -0,0 +1,6 @@
+package com.mogo.eagle.core.function.view
+
+import android.graphics.Bitmap
+import com.amap.api.maps.model.LatLng
+
+data class SiteMarkerBean(var latLng: LatLng, var bitmap: Bitmap, var anchorX: Float, var anchorY: Float)

core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml

@@ -29,5 +29,7 @@
         <attr name="topPadding" format="integer" />
         <attr name="rightPadding" format="integer" />
         <attr name="bottomPadding" format="integer" />
+        <!-- 倾斜角 -->
+        <attr name="mapTilt" format="float" />
     </declare-styleable>
 </resources>