[2.13.0-arch-opt] merge

libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java

@@ -446,12 +446,11 @@ public class AMapViewWrapper implements IMogoMapView,
      *
      * @return true-是，false-不是
      */
-    private boolean isDayMode() {
-        boolean isDayMode = mCurrentUI == EnumMapUI.MAP_STYLE_DAY_VR
+    @Override
+    public boolean isDayMode() {
+        return mCurrentUI == EnumMapUI.MAP_STYLE_DAY_VR
                 || mCurrentUI == EnumMapUI.MAP_STYLE_DAY
                 || mCurrentUI == EnumMapUI.MAP_STYLE_DAY_NAV;
-        CallerLogger.INSTANCE.d(M_MAP + TAG, "是否是白天模式: " + isDayMode);
-        return isDayMode;
     }
 
     @Override

libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java

@@ -146,7 +146,7 @@ public class AMapWrapper implements IMogoMap {
         });
         long time = markerOptionsArrayList.get(0).getTime();
         // 最后一个参数，是否管理锚点的删除
-        MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 0);
+        MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1);
     }
 
     @Override

libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java

@@ -119,6 +119,15 @@ public class MogoMapUIController implements IMogoMapUIController {
         }
     }
 
+    @Override
+    public boolean isDayMode() {
+        initDelegate();
+        if (mDelegate != null) {
+            return mDelegate.isDayMode();
+        }
+        return false;
+    }
+
     @Override
     public void showMyLocation(boolean visible) {
         initDelegate();

libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java

@@ -99,6 +99,14 @@ public class AMapUIController implements IMogoMapUIController {
         }
     }
 
+    @Override
+    public boolean isDayMode() {
+        if (mClient != null) {
+            return mClient.isDayMode();
+        }
+        return false;
+    }
+
     @Override
     public void showMyLocation(boolean visible) {
         if (mClient != null) {