diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
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 5c67f3141e..4ff6e50c62 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
@@ -380,9 +380,13 @@ public class TopViewAnimHelper {
// 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
ivTurnIcon.getId(), ConstraintSet.BOTTOM);
- constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
- constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BASELINE,
- tvNextDistance.getId(), ConstraintSet.BASELINE);
+ constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.LEFT,
+ naviBg.getId(), ConstraintSet.LEFT,
+ (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_marginLeft));
+// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
+ constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
+ tvNextDistance.getId(), ConstraintSet.BOTTOM,
+ (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom_small));
constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT,
(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46));
@@ -440,55 +444,11 @@ public class TopViewAnimHelper {
Logger.d("TopViewAnimHelper", "startTopOutAnim=====");
if (!isTopViewOut && viewCaches.contains(view)) {
-// if (topContainer.getChildCount() > 1) {
-// // 顶部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) {
-//
-// }
-//
-// @Override
-// public void onAnimationEnd(Animator animation) {
-// Logger.d(TAG, "onAnimationEnd: " + view);
-// viewCaches.remove(view);
-// topContainer.removeView(view);
-// IMogoTopViewStatusListener listener = statusListenerMap.remove(view);
-// if (listener != null) {
-// listener.onViewRemoved(view);
-// } else {
-// Logger.d(TAG, "listener is null");
-// }
-// }
-//
-// @Override
-// public void onAnimationCancel(Animator animation) {
-// viewCaches.remove(view);
-// topContainer.removeView(view);
-// }
-//
-// @Override
-// public void onAnimationRepeat(Animator animation) {
-//
-// }
-// }).start();
-// } 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
-// .module_ext_navi_info_panel_next_info_road_textSize));
-// }
if (naviBg.getVisibility() == View.VISIBLE) {
remainDistanceGroup.setVisibility(View.VISIBLE);
remainTimeGroup.setVisibility(View.VISIBLE);
@@ -509,7 +469,10 @@ public class TopViewAnimHelper {
// 约束设置需要在applyTo()方法之前执行，visiable设置需要在applyTo()
// 方法之后执行才能生效，所以分开了两个判断，至于为什么这么做才能生效，不得而知
constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM);
- constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE);
+// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE);
+ constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.LEFT,
+ naviBg.getId(), ConstraintSet.LEFT,
+ (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_marginLeft));
constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
ivTurnIcon.getId(), ConstraintSet.BOTTOM,
(int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom));
@@ -540,7 +503,6 @@ public class TopViewAnimHelper {
Logger.d(TAG, "hide top setMapCenterPointByScene: " + scene);
MapCenterPointStrategy.setMapCenterPointByScene(mogoMapUIController, scene);
}
-// }
}
public void showNaviView() {
@@ -562,7 +524,10 @@ public class TopViewAnimHelper {
// 调整约束
constraintSet.clone(topMotionLayout);
constraintSet.clear(tvNextDistance.getId(), ConstraintSet.BOTTOM);
- constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE);
+// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BASELINE);
+ constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.LEFT,
+ naviBg.getId(), ConstraintSet.LEFT,
+ (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_marginLeft));
constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM, ivTurnIcon.getId(),
ConstraintSet.BOTTOM);
constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
@@ -594,9 +559,13 @@ public class TopViewAnimHelper {
constraintSet.clone(topMotionLayout);
constraintSet.connect(tvNextDistance.getId(), ConstraintSet.BOTTOM,
ivTurnIcon.getId(), ConstraintSet.BOTTOM);
- constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
- constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BASELINE,
- tvNextDistance.getId(), ConstraintSet.BASELINE);
+ constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.LEFT,
+ naviBg.getId(), ConstraintSet.LEFT,
+ (int) getDimen(R.dimen.module_ext_navi_info_panel_turn_icon_small_marginLeft));
+// constraintSet.clear(tvNextRoad.getId(), ConstraintSet.BOTTOM);
+ constraintSet.connect(tvNextRoad.getId(), ConstraintSet.BOTTOM,
+ tvNextDistance.getId(), ConstraintSet.BOTTOM,
+ (int) getDimen(R.dimen.module_map_id_navi_next_info_road_marginBottom_small));
constraintSet.connect(tvNextRoad.getId(), ConstraintSet.LEFT,
R.id.module_map_id_navi_next_info_turn_info, ConstraintSet.RIGHT,
(int) topMotionLayout.getContext().getResources().getDimension(R.dimen.dp_46));
diff --git a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
index 431f1560b1..97dc87283c 100644
--- a/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
+++ b/modules/mogo-module-extensions/src/main/res/layout/include_navi_info_panle.xml
@@ -187,7 +187,7 @@
android:id="@+id/module_map_id_arrive_time_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="@dimen/dp_95"
+ android:layout_marginEnd="@dimen/module_ext_navi_extra_info_margin_right"
android:src="@drawable/module_ext_ic_navi_info3"
app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time"
app:layout_constraintRight_toRightOf="@+id/module_map_id_navi_bg"
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 0e3d697760..ad9dc6d8fb 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -39,7 +39,7 @@
120px
120px
120px
- 40px
+ 30px
30px
32px
32px
@@ -84,7 +84,7 @@
159px
70px
70px
- 24px
+ 56px
83px
24px
40px
@@ -103,6 +103,7 @@
36px
36px
-2px
+ 95px
30px
40px
@@ -138,6 +139,7 @@
90px
6dp
15px
+ 4px
10px
20px
diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
index b1e5bf7240..7423964cdd 100644
--- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml
@@ -39,7 +39,7 @@
120px
120px
120px
- 40px
+ 30px
30px
32px
32px
@@ -84,7 +84,7 @@
159px
70px
70px
- 24px
+ 56px
83px
24px
40px
@@ -103,6 +103,7 @@
36px
36px
-2px
+ 95px
30px
40px
@@ -138,6 +139,7 @@
90px
6dp
15px
+ 4px
10px
20px
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index 3b7a570ba8..26b9b2c5fe 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -40,7 +40,7 @@
66px
66px
66px
- 21px
+ 16px
16px
34.5px
20px
@@ -82,25 +82,26 @@
544px
117px
- 60px
+ 80px
85px
85px
- 38px
- 38px
- 13px
+ 40px
+ 40px
+ 30px
+ 44px
13px
20px
32px
- 32px
+ 28px
7px
5px
22px
- 22px
+ 16px
18px
- 24px
-
+ 24px
15px
- 5px
+ 13px
+ 58px
9px
9px
@@ -142,6 +143,7 @@
58px
3dp
10px
+ 4px
6px
10px