From 8b804bfa40c14ddade61d3b38a1df69409986b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 29 May 2020 18:47:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 48 +++++++++++++++++++++++------------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 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 9c05cfb35f..a39069dfed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,34 +27,34 @@ PASSWORD=xintai2018 RELEASE=false # 模块版本 ## 工程内模块 -MOGO_COMMONS_VERSION=1.1.0.12 -MOGO_UTILS_VERSION=1.1.0.12 -MAP_AMAP_VERSION=1.1.0.12 -MOGO_MAP_VERSION=1.1.0.12 -MOGO_MAP_API_VERSION=1.1.0.12 -MOGO_SERVICE_VERSION=1.1.0.12 -MOGO_SERVICE_API_VERSION=1.1.0.12 -MOGO_CONNECTION_VERSION=1.1.0.12 -MOGO_MODULE_APPS_VERSION=1.1.0.12 -MOGO_MODULE_NAVI_VERSION=1.1.0.12 -MOGO_MODULE_SHARE_VERSION=1.1.0.12 -MOGO_MODULE_COMMON_VERSION=1.1.0.12 -MOGO_MODULE_MAIN_VERSION=1.1.0.12 -MOGO_MODULE_MAP_VERSION=1.1.0.12 -MOGO_MODULE_SERVICE_VERSION=1.1.0.12 +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.12 -MOGO_MODULE_BACK_VERSION=1.1.0.12 -MOGO_MODULE_GPS_SIMULATOR_VERSION=1.1.0.12 -MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.1.0.12 -MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.1.0.12 -MOGO_MODULE_AUTHORIZE_VERSION=1.1.0.12 -MOGO_MODULE_GUIDE_VERSION=1.1.0.12 +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_MODULE_TANLU_VERSION=1.0.6.2 +MOGO_MODULE_TANLU_VERSION=1.0.6-SNAPSHOT # 车聊聊 CARCHATTING_VERSION=1.0.4-SNAPSHOT # 车聊聊接口 @@ -68,7 +68,7 @@ MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2 # v2x MOGO_MODULE_V2X_VERSION=1.0.7 # 媒体卡片 -MOGO_MODULE_MEDIA_VERSION=1.0.4.11 +MOGO_MODULE_MEDIA_VERSION=1.0.4.4 # 推送 MOGO_MODULE_PUSH_VERSION=1.0.1 # 广告资源位 From 2c4d5c379c4898bf7e424e99f1d02b7374a68b9a Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Fri, 29 May 2020 19:50:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=8E=BB=E6=8E=89D?= =?UTF-8?q?=E7=B3=BB=E5=88=97=E9=A1=B6=E9=83=A8=E6=BB=91=E5=85=A5=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=EF=BC=8C=E5=90=8E=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/module/extensions/utils/TopViewAnimHelper.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 d313776569..e45671d9cc 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 @@ -19,6 +19,7 @@ import androidx.constraintlayout.widget.Group; import com.mogo.map.uicontroller.IMogoMapUIController; import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; +import com.mogo.module.common.utils.CarSeries; import com.mogo.module.extensions.R; import com.mogo.module.extensions.navi.TopView; import com.mogo.service.windowview.IMogoTopViewStatusListener; @@ -155,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"); @@ -216,7 +217,9 @@ public class TopViewAnimHelper { 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); - TransitionManager.beginDelayedTransition(topMotionLayout, transition); + if(CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X) { + TransitionManager.beginDelayedTransition(topMotionLayout, transition); + } checkCameraModePosition(false); if (naviBg.getVisibility() == View.VISIBLE) { // 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo()