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

Merge branch 'qa' into qa_topview

Browse Source 
# Conflicts:
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java
This commit is contained in:
tongchenfei
2020-06-17 11:40:28 +08:00
parent 8b84c16cbb 757f3d056d
commit 806231cfa7
3 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gradle.properties
View File

@@ -27,34 +27,34 @@ PASSWORD=xintai2018
RELEASE=false
# 模块版本
## 工程内模块
MOGO_COMMONS_VERSION=1.2.1
MOGO_UTILS_VERSION=1.2.1
MAP_AMAP_VERSION=1.2.1
MAP_AUTONAVI_VERSION=1.2.1
MOGO_MAP_VERSION=1.2.1
MOGO_MAP_API_VERSION=1.2.1
MOGO_SERVICE_VERSION=1.2.1
MOGO_SERVICE_API_VERSION=1.2.1
MOGO_CONNECTION_VERSION=1.2.1
MOGO_MODULE_APPS_VERSION=1.2.1
MOGO_MODULE_NAVI_VERSION=1.2.1
MOGO_MODULE_SHARE_VERSION=1.2.1
MOGO_MODULE_COMMON_VERSION=1.2.1
MOGO_MODULE_MAIN_VERSION=1.2.1
MOGO_MODULE_MAP_VERSION=1.2.1
MOGO_MODULE_SERVICE_VERSION=1.2.1
MOGO_MODULE_EXTENSIONS_VERSION=1.2.1
MOGO_MODULE_SEARCH_VERSION=1.2.1
MOGO_MODULE_BACK_VERSION=1.2.1
MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1
MOGO_MODULE_AUTHORIZE_VERSION=1.2.1
MOGO_MODULE_GUIDE_VERSION=1.2.1
MOGO_MODULE_MEDIA_VERSION=1.2.1
MOGO_COMMONS_VERSION=1.2.1.1
MOGO_UTILS_VERSION=1.2.1.1
MAP_AMAP_VERSION=1.2.1.1
MAP_AUTONAVI_VERSION=1.2.1.1
MOGO_MAP_VERSION=1.2.1.1
MOGO_MAP_API_VERSION=1.2.1.1
MOGO_SERVICE_VERSION=1.2.1.1
MOGO_SERVICE_API_VERSION=1.2.1.1
MOGO_CONNECTION_VERSION=1.2.1.1
MOGO_MODULE_APPS_VERSION=1.2.1.1
MOGO_MODULE_NAVI_VERSION=1.2.1.1
MOGO_MODULE_SHARE_VERSION=1.2.1.1
MOGO_MODULE_COMMON_VERSION=1.2.1.1
MOGO_MODULE_MAIN_VERSION=1.2.1.1
MOGO_MODULE_MAP_VERSION=1.2.1.1
MOGO_MODULE_SERVICE_VERSION=1.2.1.1
MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.1
MOGO_MODULE_SEARCH_VERSION=1.2.1.1
MOGO_MODULE_BACK_VERSION=1.2.1.1
MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.1
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.1
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.1
MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.1
MOGO_MODULE_GUIDE_VERSION=1.2.1.1
MOGO_MODULE_MEDIA_VERSION=1.2.1.1
MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.0.0.2
MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.0.0.2
MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.0.0.3
MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.0.0.3
## 工程外部模块

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

@@ -184,6 +184,9 @@ public class TopViewAnimHelper {
topContainer.addView(view, params);
Logger.d(TAG, "顶部view已经有布局了，增加新增view滑入动画: " + view.getTranslationY() + " height:" +
" " + view.getHeight() + " paramsHeight: " + params.height);
if (statusListenerMap.get(view) != null) {
statusListenerMap.get(view).beforeViewAddAnim(view);
}
view.animate().translationY(0).setDuration(500).setListener(new Animator.AnimatorListener() {
@Override
public void onAnimationStart(Animator animation) {
@@ -219,6 +222,9 @@ public class TopViewAnimHelper {
topContainer.addView(view, params);
Logger.d(TAG, "整体进入==== view.visibility: " + view.getVisibility() + " view" +
".position: (" + view.getX() + ", " + view.getY() + ") params.width: " + params.width + " params.height: " + params.height);
if (statusListenerMap.get(view) != null) {
statusListenerMap.get(view).beforeViewAddAnim(view);
}
topContainer.setChildAddedListener(child -> {
if (naviBg.getVisibility() == View.VISIBLE) {
remainDistanceGroup.setVisibility(View.GONE);
@@ -301,6 +307,9 @@ public class TopViewAnimHelper {
// 顶部view包含多个view，只推出当前view，不进行整体上移
Logger.d(TAG,
"小view退出: " + view.getTranslationY() + " height: " + view.getHeight());
if (statusListenerMap.get(view) != null) {
statusListenerMap.get(view).beforeViewRemoveAnim(view);
}
view.animate().translationY(-(view.getHeight())).setDuration(500).setListener(new Animator.AnimatorListener() {
@Override
public void onAnimationStart(Animator animation) {
@@ -334,6 +343,9 @@ public class TopViewAnimHelper {
} else {
// 顶部view仅剩一个view，需要整体上移
currentAnimatingView = view;
if (statusListenerMap.get(view) != null) {
statusListenerMap.get(view).beforeViewRemoveAnim(view);
}
isTopViewOut = true;
// if (naviBg.getVisibility() == View.VISIBLE) {
// tvNextRoad.setTextSize(getDimen(R.dimen

12
services/mogo-service-api/src/main/java/com/mogo/service/windowview/IMogoTopViewStatusListener.java
View File

@@ -19,4 +19,16 @@ public interface IMogoTopViewStatusListener {
* @param view 移除的view
*/
void onViewRemoved(View view);
/**
* view添加动画开始之前
* @param view 添加的view
*/
void beforeViewAddAnim(View view);
/**
* view 移除动画开始之前
* @param view 移除的view
*/
void beforeViewRemoveAnim(View view);
}