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 f3c47ccf53..ed2f4511a2 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
@@ -52,6 +52,8 @@ public class TopViewAnimHelper {
private TextView tvTurnInfo;
private TopView topContainer;
+ private TextView tvDestinationOnlineCar;
+
private ConstraintSet constraintSet;
private Transition transition;
private TextView cameraMode;
@@ -101,6 +103,7 @@ public class TopViewAnimHelper {
topContainer = rootView.findViewById(R.id.module_entrance_id_top_container);
tvNextDistanceUnit = rootView.findViewById(R.id.module_map_id_navi_next_info_distance_unit);
tvTurnInfo = rootView.findViewById(R.id.module_map_id_navi_next_info_turn_info);
+ tvDestinationOnlineCar = rootView.findViewById(R.id.module_ext_id_destination_online_car);
shader = rootView.findViewById(R.id.module_ext_id_top_container_shader);
@@ -425,6 +428,19 @@ public class TopViewAnimHelper {
tvNextDistanceUnit.setTextSize(TypedValue.COMPLEX_UNIT_PX,
getDimen(R.dimen.module_ext_navi_info_panel_next_info_distance_unit_textSize_small));
+ // 改变目的地车友的约束
+ constraintSet.clear(tvDestinationOnlineCar.getId());
+ constraintSet.connect(tvDestinationOnlineCar.getId(),
+ ConstraintSet.BOTTOM, naviBg.getId(), ConstraintSet.BOTTOM,
+ (int) getDimen(R.dimen.module_ext_navi_small_margin_bottom));
+ constraintSet.connect(tvDestinationOnlineCar.getId(),
+ ConstraintSet.RIGHT, naviBg.getId(), ConstraintSet.RIGHT,
+ (int) getDimen(R.dimen.module_ext_navi_small_margin_right));
+
+ tvDestinationOnlineCar.getLayoutParams().height =
+ (int) getDimen(R.dimen.module_ext_navi_info_panel_small_height);
+ tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_small_bkg);
+
}
constraintSet.applyTo(topMotionLayout);
ivTurnIcon.getLayoutParams().height =
@@ -516,6 +532,18 @@ public class TopViewAnimHelper {
ConstraintSet.TOP, 0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM, 0);
+
+ constraintSet.clear(tvDestinationOnlineCar.getId());
+ constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.LEFT,
+ naviBg.getId(), ConstraintSet.LEFT);
+ constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.TOP,
+ naviBg.getId(), ConstraintSet.BOTTOM,
+ (int) getDimen(R.dimen.module_ext_camera_button_marginTop));
+
+ tvDestinationOnlineCar.getLayoutParams().height =
+ (int) getDimen(R.dimen.module_ext_navi_info_panel_height);
+ tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_bkg);
+
}
constraintSet.applyTo(topMotionLayout);
@@ -579,6 +607,19 @@ public class TopViewAnimHelper {
ConstraintSet.TOP, 0);
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM, 0);
+
+ // 目的地车友
+ constraintSet.clear(tvDestinationOnlineCar.getId());
+ constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.LEFT,
+ naviBg.getId(), ConstraintSet.LEFT);
+ constraintSet.connect(tvDestinationOnlineCar.getId(), ConstraintSet.TOP,
+ naviBg.getId(), ConstraintSet.BOTTOM,
+ (int) getDimen(R.dimen.module_ext_camera_button_marginTop));
+
+ tvDestinationOnlineCar.getLayoutParams().height =
+ (int) getDimen(R.dimen.module_ext_navi_info_panel_height);
+ tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_bkg);
+
constraintSet.applyTo(topMotionLayout);
scene = Scene.NAVI_WITH_ROAD_EVENT;
} else {
@@ -608,6 +649,20 @@ public class TopViewAnimHelper {
constraintSet.connect(ivTurnIcon.getId(), ConstraintSet.BOTTOM,
naviBg.getId(), ConstraintSet.BOTTOM,
(int) getDimen(R.dimen.module_ext_navi_info_turn_icon_margin_bottom));
+
+ // 目的地车友
+ constraintSet.clear(tvDestinationOnlineCar.getId());
+ constraintSet.connect(tvDestinationOnlineCar.getId(),
+ ConstraintSet.BOTTOM, naviBg.getId(), ConstraintSet.BOTTOM,
+ (int) getDimen(R.dimen.module_ext_navi_small_margin_bottom));
+ constraintSet.connect(tvDestinationOnlineCar.getId(),
+ ConstraintSet.RIGHT, naviBg.getId(), ConstraintSet.RIGHT,
+ (int) getDimen(R.dimen.module_ext_navi_small_margin_right));
+
+ tvDestinationOnlineCar.getLayoutParams().height =
+ (int) getDimen(R.dimen.module_ext_navi_info_panel_small_height);
+ tvDestinationOnlineCar.setBackgroundResource(R.drawable.module_ext_dw_navi_info_panel_small_bkg);
+
constraintSet.applyTo(topMotionLayout);
scene = Scene.NAVI;
}
diff --git a/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_small_bkg.xml b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_small_bkg.xml
new file mode 100644
index 0000000000..a438f2fa4f
--- /dev/null
+++ b/modules/mogo-module-extensions/src/main/res/drawable/module_ext_dw_navi_info_panel_small_bkg.xml
@@ -0,0 +1,9 @@
+
+
+ -
+
+
+
+
+
+
\ No newline at end of file
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 99476d878e..c56cb75bbb 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -138,6 +138,7 @@
142px
66px
66px
+ 44px
10px
12px
14px
@@ -173,4 +174,8 @@
22px
16px
+
+ 11px
+ 11px
+ 10px
\ No newline at end of file