yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/v2.0.0' into feature/v2.0.0

Browse Source
This commit is contained in:
董宏宇
2020-05-29 20:54:19 +08:00
parent ff451aca7d 42d2ce266a
commit 80f2016e2e
3 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
</project>

46
gradle.properties
View File

@@ -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
## 工程外部模块

13
modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
View File

@@ -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,