diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..2dc54c489f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 0a20c8333e..95294f0192 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,29 +27,29 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=1.1.0.14 -MOGO_UTILS_VERSION=1.1.0.14 -MAP_AMAP_VERSION=1.1.0.14 -MOGO_MAP_VERSION=1.1.0.14 -MOGO_MAP_API_VERSION=1.1.0.14 -MOGO_SERVICE_VERSION=1.1.0.14 -MOGO_SERVICE_API_VERSION=1.1.0.14 -MOGO_CONNECTION_VERSION=1.1.0.14 -MOGO_MODULE_APPS_VERSION=1.1.0.14 -MOGO_MODULE_NAVI_VERSION=1.1.0.14 -MOGO_MODULE_SHARE_VERSION=1.1.0.14 -MOGO_MODULE_COMMON_VERSION=1.1.0.14 -MOGO_MODULE_MAIN_VERSION=1.1.0.14 -MOGO_MODULE_MAP_VERSION=1.1.0.14 -MOGO_MODULE_SERVICE_VERSION=1.1.0.14 -MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.14 -MOGO_MODULE_SEARCH_VERSION=1.1.0.14 -MOGO_MODULE_BACK_VERSION=1.1.0.14 -MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.14 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.14 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.14 -MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.14 -MOGO_MODULE_GUIDE_VERSION=1.1.0.14 +MOGO_COMMONS_VERSION=1.1.0.15 +MOGO_UTILS_VERSION=1.1.0.15 +MAP_AMAP_VERSION=1.1.0.15 +MOGO_MAP_VERSION=1.1.0.15 +MOGO_MAP_API_VERSION=1.1.0.15 +MOGO_SERVICE_VERSION=1.1.0.15 +MOGO_SERVICE_API_VERSION=1.1.0.15 +MOGO_CONNECTION_VERSION=1.1.0.15 +MOGO_MODULE_APPS_VERSION=1.1.0.15 +MOGO_MODULE_NAVI_VERSION=1.1.0.15 +MOGO_MODULE_SHARE_VERSION=1.1.0.15 +MOGO_MODULE_COMMON_VERSION=1.1.0.15 +MOGO_MODULE_MAIN_VERSION=1.1.0.15 +MOGO_MODULE_MAP_VERSION=1.1.0.15 +MOGO_MODULE_SERVICE_VERSION=1.1.0.15 +MOGO_MODULE_EXTENSIONS_VERSION=1.1.0.15 +MOGO_MODULE_SEARCH_VERSION=1.1.0.15 +MOGO_MODULE_BACK_VERSION=1.1.0.15 +MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.15 +MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.15 +MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.15 +MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.15 +MOGO_MODULE_GUIDE_VERSION=1.1.0.15 ## 工程外部模块 diff --git 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 index e45671d9cc..18d03c828d 100644 --- 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 @@ -117,12 +117,12 @@ public class TopViewAnimHelper { if (isTopViewOut) { viewCaches.remove(currentAnimatingView); listener = statusListenerMap.remove(currentAnimatingView); - if(listener!=null) { + if (listener != null) { listener.onViewRemoved(currentAnimatingView); } } else { listener = statusListenerMap.get(currentAnimatingView); - if(listener!=null) { + if (listener != null) { listener.onViewAdded(currentAnimatingView); } } @@ -156,7 +156,7 @@ public class TopViewAnimHelper { private View currentAnimatingView = null; public void startTopInAnim(View view, ViewGroup.LayoutParams params, - IMogoTopViewStatusListener statusListener){ + IMogoTopViewStatusListener statusListener) { Logger.d(TAG, "startTopInAnim=====" + isTopViewOut); if (view == null) { throw new IllegalArgumentException("method addTopView params view is null"); @@ -214,10 +214,10 @@ public class TopViewAnimHelper { constraintSet.clone(topMotionLayout); - constraintSet.clear(R.id.module_entrance_id_top_container,ConstraintSet.BOTTOM); + constraintSet.clear(R.id.module_entrance_id_top_container, ConstraintSet.BOTTOM); constraintSet.connect(R.id.module_entrance_id_top_container, ConstraintSet.TOP, R.id.module_entrance_id_top_motion_layout, ConstraintSet.TOP); - if(CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { + if (CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { TransitionManager.beginDelayedTransition(topMotionLayout, transition); } checkCameraModePosition(false); @@ -263,8 +263,7 @@ public class TopViewAnimHelper { public void startTopOutAnim(View view) { Logger.d("TopViewAnimHelper", "startTopOutAnim====="); - if (!isTopViewOut) { - + if (!isTopViewOut && viewCaches.contains(view)) { if (topContainer.getChildCount() > 1) { // 顶部view包含多个view,只推出当前view,不进行整体上移 Logger.d(TAG,