Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map

2020-12-25 16:10:44 +08:00
parent 7757793225 27b2b045d1
commit 55c68a648e
7 changed files with 67 additions and 67 deletions
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/utils/ObjectUtils.java
@@ -72,8 +72,8 @@ public class ObjectUtils {
        MarkerOptions markerOptions = new MarkerOptions()
                .position(new LonLatPoint(opt.getLongitude(), opt.getLatitude()))
                .anchor(opt.getU(), opt.getV())
-//                .icons( descriptors )
-//                .period( opt.getPeriod() )
+                .icons( descriptors )
+                .period( opt.getPeriod() )
                .rotateAngle(opt.getRotate())
                .setFlat(opt.isFlat())
                .visible(opt.isVisible())