Merge remote-tracking branch 'origin/dev_robo_240612_6.5.0_tmp' into dev_robo_240612_6.5.0_tmp

libraries/mogo-map-api/src/main/java/com/mogo/map/overlay/point/Point.kt

@@ -151,6 +151,21 @@ data class Point(val id: String, val owner: String, val level: Level, val option
          */
         val moveToCenter: Boolean = builder.moveToCenter
 
+        /**
+         * 设置动画资源
+         */
+        val displayAnim:Boolean = builder.displayAnim
+
+        /**
+         * 动画资源
+         */
+        val animRes:Int = builder.animRes
+
+        /**
+         * 动画缩放
+         */
+        val animScale:Float = builder.animScale
+
         /**
          * marker点击事件处理
          */
@@ -291,6 +306,33 @@ data class Point(val id: String, val owner: String, val level: Level, val option
              */
             internal var onMarkerClickListener:WeakReference<((id: String) -> Unit)>? = null
 
+            /**
+             * 是否显示动画
+             */
+            internal var displayAnim:Boolean = false
+
+            /**
+             * 设置动画资源
+             */
+            internal var animRes:Int = 0
+
+            /**
+             * 动画缩放
+             */
+            internal var animScale:Float = 0f
+
+            fun setDisplayAnim(displayAnim:Boolean) = apply {
+                this.displayAnim = displayAnim
+            }
+
+            fun setAnimResource(animRes: Int) = apply {
+                this.animRes = animRes
+            }
+
+            fun setAnimScale(animScale: Float) = apply {
+                this.animScale = animScale
+            }
+
             fun setId(id: String) = apply {
                 this.id = id
             }

libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java

@@ -65,6 +65,9 @@ public class ObjectUtils {
                 .controlAngle(opt.isControlAngle())
                 .rotateAngle(opt.getRotate())
                 .setFlat(opt.isFlat())
+//                .setAnimResource()
+//                .setDisplayAnimEnable()
+//                .setAnimScale()
                 .visible(opt.isVisible())
                 .infoWindowEnable(opt.isInfoWindowEnable())
                 .scale(opt.getScale())
@@ -119,16 +122,13 @@ public class ObjectUtils {
             markerOptions.setTime(Double.valueOf(trafficData.getSatelliteTime() * 1000).longValue());
             if(!trafficData.getColor().isEmpty()){
                 if(trafficData.getColor().contains("-drawColor")){
-//                    markerOptions.setColorType(3);
                     markerOptions.setColor(trafficData.getColor().split("-")[0]);
                 } else if(trafficData.getColor().contains("-resetColor")){
-//                    markerOptions.setColorType(4);
                     markerOptions.setColor(trafficData.getColor().split("-")[0]);
                 } else{
                     markerOptions.setColor(trafficData.getColor());
                 }
             }else{
-//                markerOptions.setColorType(0);
                 markerOptions.setColor("#00000000");
             }
         } catch (Exception e) {