diff --git a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
index 4f62ea025e..0bd98cd161 100644
--- a/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
+++ b/OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
@@ -30,15 +30,6 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_height="match_parent">
@@ -57,76 +58,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ app:layout_constraintLeft_toRightOf="@id/reportworkorderview" />
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -370,8 +227,7 @@
android:layout_width="1560dp"
android:layout_height="1534dp"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- />
+ app:layout_constraintTop_toTopOf="parent" />
()
-
- init {
- LayoutInflater.from(context).inflate(R.layout.view_v2x_warning, this, true)
- }
-
- override fun onAttachedToWindow() {
- super.onAttachedToWindow()
- CallerV2XWarningListenerManager.addListener(TAG, this)
- }
-
- override fun show(v2xType: String, direction: WarningDirectionEnum, time: Long) {
- showWarning(direction, time)
- }
-
- override fun dismiss(direction: WarningDirectionEnum) {
- dismissWarning(direction)
- }
-
- /**
- * 展示指定方位上的红框预警
- * @param direction
- * @see WarningDirectionEnum
- */
- private fun showWarning(direction: WarningDirectionEnum, time: Long = ALL_CLOSE_TIMER) {
- // 如果传入的不是关闭显示,则设置倒计时,定时关闭红框警示
- if (oldDirection.get() == direction) {
- removeCallbacks(closeWarningTask)
- postDelayed(closeWarningTask, time)
- return
- }
- if (direction != ALERT_WARNING_NON) {
- oldDirection.set(direction)
- removeCallbacks(closeWarningTask)
- postDelayed(closeWarningTask, time)
- }
- post {
- when (direction) {
- ALERT_WARNING_NON -> {
- // nothing
- }
- ALERT_WARNING_TOP -> {
- hmiWarningTopImg.visibility = View.VISIBLE
- hmiWarningRightImg.visibility = View.GONE
- hmiWarningBottomImg.visibility = View.GONE
- hmiWarningLeftImg.visibility = View.GONE
- hmiWarningLeftTopImg.visibility = View.GONE
- hmiWarningLeftBottomImg.visibility = View.GONE
- hmiWarningRightTopImg.visibility = View.GONE
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_RIGHT -> {
- hmiWarningTopImg.visibility = View.GONE
- hmiWarningRightImg.visibility = View.VISIBLE
- hmiWarningBottomImg.visibility = View.GONE
- hmiWarningLeftImg.visibility = View.GONE
- hmiWarningLeftTopImg.visibility = View.GONE
- hmiWarningLeftBottomImg.visibility = View.GONE
- hmiWarningRightTopImg.visibility = View.GONE
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_BOTTOM -> {
- hmiWarningTopImg.visibility = View.GONE
- hmiWarningRightImg.visibility = View.GONE
- hmiWarningBottomImg.visibility = View.VISIBLE
- hmiWarningLeftImg.visibility = View.GONE
- hmiWarningLeftTopImg.visibility = View.GONE
- hmiWarningLeftBottomImg.visibility = View.GONE
- hmiWarningRightTopImg.visibility = View.GONE
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_LEFT -> {
- hmiWarningTopImg.visibility = View.GONE
- hmiWarningRightImg.visibility = View.GONE
- hmiWarningBottomImg.visibility = View.GONE
- hmiWarningLeftImg.visibility = View.VISIBLE
- hmiWarningLeftTopImg.visibility = View.GONE
- hmiWarningLeftBottomImg.visibility = View.GONE
- hmiWarningRightTopImg.visibility = View.GONE
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_TOP_RIGHT -> {
- hmiWarningTopImg.visibility = View.GONE
- hmiWarningRightImg.visibility = View.GONE
- hmiWarningBottomImg.visibility = View.GONE
- hmiWarningLeftImg.visibility = View.GONE
- hmiWarningLeftTopImg.visibility = View.GONE
- hmiWarningLeftBottomImg.visibility = View.GONE
- hmiWarningRightTopImg.visibility = View.VISIBLE
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_BOTTOM_RIGHT -> {
- hmiWarningTopImg.visibility = View.GONE
- hmiWarningRightImg.visibility = View.GONE
- hmiWarningBottomImg.visibility = View.GONE
- hmiWarningLeftImg.visibility = View.GONE
- hmiWarningLeftTopImg.visibility = View.GONE
- hmiWarningLeftBottomImg.visibility = View.GONE
- hmiWarningRightTopImg.visibility = View.GONE
- hmiWarningRightBottomImg.visibility = View.VISIBLE
- }
- ALERT_WARNING_BOTTOM_LEFT -> {
- hmiWarningTopImg.visibility = View.GONE
- hmiWarningRightImg.visibility = View.GONE
- hmiWarningBottomImg.visibility = View.GONE
- hmiWarningLeftImg.visibility = View.GONE
- hmiWarningLeftTopImg.visibility = View.GONE
- hmiWarningLeftBottomImg.visibility = View.VISIBLE
- hmiWarningRightTopImg.visibility = View.GONE
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_TOP_LEFT -> {
- hmiWarningTopImg.visibility = View.GONE
- hmiWarningRightImg.visibility = View.GONE
- hmiWarningBottomImg.visibility = View.GONE
- hmiWarningLeftImg.visibility = View.GONE
- hmiWarningLeftTopImg.visibility = View.VISIBLE
- hmiWarningLeftBottomImg.visibility = View.GONE
- hmiWarningRightTopImg.visibility = View.GONE
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_ALL -> { //todo problem
- hmiWarningTopImg.visibility = View.VISIBLE
- hmiWarningRightImg.visibility = View.GONE
- hmiWarningBottomImg.visibility = View.GONE
- hmiWarningLeftImg.visibility = View.GONE
- hmiWarningLeftTopImg.visibility = View.GONE
- hmiWarningLeftBottomImg.visibility = View.GONE
- hmiWarningRightTopImg.visibility = View.GONE
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- }
- if (direction == ALERT_WARNING_NON) {
- dismissWarning(ALERT_WARNING_ALL)
- } else {
- val alphaAnimation = AlphaAnimation(0f, 0.88f)
- alphaAnimation.duration = 600
- alphaAnimation.interpolator = LinearInterpolator()
- alphaAnimation.repeatCount = Animation.INFINITE
- alphaAnimation.repeatMode = Animation.REVERSE
- startAnimation(alphaAnimation)
- }
- }
- }
-
- private fun dismissWarning(direction: WarningDirectionEnum) {
- if (direction == ALERT_WARNING_NON) {
- return
- }
- removeCallbacks(closeWarningTask)
- post {
- when (direction) {
- ALERT_WARNING_TOP -> {
- hmiWarningRightTopImg.visibility = View.GONE
- }
- ALERT_WARNING_RIGHT -> {
- hmiWarningRightImg.visibility = View.GONE
- }
- ALERT_WARNING_BOTTOM -> {
- hmiWarningBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_LEFT -> {
- hmiWarningLeftImg.visibility = View.GONE
- }
- ALERT_WARNING_TOP_RIGHT -> {
- hmiWarningRightTopImg.visibility = View.GONE
- }
- ALERT_WARNING_BOTTOM_RIGHT -> {
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_BOTTOM_LEFT -> {
- hmiWarningLeftBottomImg.visibility = View.GONE
- }
- ALERT_WARNING_TOP_LEFT -> {
- hmiWarningLeftTopImg.visibility = View.GONE
- }
- ALERT_WARNING_ALL -> {
- hmiWarningTopImg.visibility = View.GONE
- hmiWarningRightImg.visibility = View.GONE
- hmiWarningBottomImg.visibility = View.GONE
- hmiWarningLeftImg.visibility = View.GONE
- hmiWarningLeftTopImg.visibility = View.GONE
- hmiWarningLeftBottomImg.visibility = View.GONE
- hmiWarningRightTopImg.visibility = View.GONE
- hmiWarningRightBottomImg.visibility = View.GONE
- }
- else -> {
- CallerLogger.d("$M_HMI$TAG", "Not Support Direction")
- }
- }
- clearAnimation()
- this.oldDirection.set(null)
- }
- }
-
- override fun onDetachedFromWindow() {
- super.onDetachedFromWindow()
- CallerV2XWarningListenerManager.removeListener(TAG)
- }
-}
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
index dff2577d56..57417a5d5f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_bone_container.xml
@@ -11,6 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_19"
+ android:layout_marginTop="@dimen/dp_76"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
index 28a2815b27..89d954a22a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_map_container.xml
@@ -23,14 +23,13 @@
android:layout_height="270dp"
android:layout_marginStart="1230dp"
android:layout_marginTop="1204dp"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
app:bottomPadding="160"
app:carDrawable="@drawable/taxt_u_p_map_car"
app:compassDrawable="@drawable/taxt_u_p_map_car_light"
- app:startPointDrawable="@drawable/taxi_overmap_startpoint"
app:endPointDrawable="@drawable/taxi_overmap_endpoint"
app:globalPathColor="#39BA90"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
app:leftPadding="70"
app:mapStyleExtraPath="over_view_style_extra.data"
app:mapStylePath="over_view_style.data"
@@ -38,6 +37,7 @@
app:rightPadding="70"
app:roadRangeDrawable="@drawable/taxi_overmap_road_range"
app:roadTrajectoryDrawable="@drawable/taxi_orvermap_road_trajectory"
+ app:startPointDrawable="@drawable/taxi_overmap_startpoint"
app:topPadding="70" />
+
+
+
+ app:layout_constraintEnd_toStartOf="@+id/visualAngleToggle"
+ app:layout_goneMarginEnd="@dimen/dp_50" />
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+
+
+
+
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_bottom.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_bottom.xml
deleted file mode 100644
index bf08199996..0000000000
--- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_bottom.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_left.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_left.xml
deleted file mode 100644
index aa8f02910c..0000000000
--- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_left.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right.xml
deleted file mode 100644
index 96d008ba4f..0000000000
--- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_bottom.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_bottom.xml
deleted file mode 100644
index 4a643eb15b..0000000000
--- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_bottom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_top.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_top.xml
deleted file mode 100644
index 7da82a936d..0000000000
--- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_right_top.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_top.xml b/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_top.xml
deleted file mode 100644
index 4225002fff..0000000000
--- a/core/mogo-core-res/src/main/function-hmi-res/drawable/module_hmi_warning_bkg_top.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_left.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_left.png
deleted file mode 100644
index 0dff4373e6..0000000000
Binary files a/core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_left.png and /dev/null differ
diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_right.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_right.png
deleted file mode 100644
index 2d2869dcb0..0000000000
Binary files a/core/mogo-core-res/src/main/res/drawable-xhdpi/bottom_right.png and /dev/null differ