Merge branch 'dev' into qa

2020-06-17 12:21:10 +08:00
parent 757f3d056d c5c3e56fa6
commit a4ba20109e
42 changed files with 714 additions and 139 deletions
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
@@ -484,9 +484,9 @@ public class TopViewAnimHelper {
        arriveTimeGroup.setVisibility(View.GONE);
        int scene = 0;
        if (isTopViewOut) {
-            scene = Scene.AIMLESS_WITH_ROAD_EVENT;
-        } else {
            scene = Scene.AIMLESS;
+        } else {
+            scene = Scene.AIMLESS_WITH_ROAD_EVENT;
        }
        Logger.d(TAG, "hide navi setMapCenterPointByScene: " + scene);
        MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, scene);