From 01fe95696bad2440ef763aa926b3ff4552ef7f5f Mon Sep 17 00:00:00 2001
From: xuxinchao <xuxinchao@zhidaoauto.com>
Date: Thu, 11 Jul 2024 18:39:41 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0]=E8=A1=8C=E7=A8=8B=E6=80=BB=E7=BB=93?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=B0=E5=9B=BE=EF=BC=8C=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E8=B5=84=E6=BA=90=E5=88=B0res?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo-core-function-hmi/build.gradle       |   1 +
 .../res/layout/dialog_itinerary_summary.xml   |  20 ++++++++++++++++++
 .../res/layout/dialog_itinerary_summary_p.xml |  20 ++++++++++++++++++
 .../res/drawable-nodpi/taxt_u_p_map_car.png   | Bin
 .../drawable-nodpi/taxt_u_p_map_car_light.png | Bin
 .../taxt_u_p_map_view_dir_end.png             | Bin
 .../taxt_u_p_map_view_dir_start.png           | Bin
 .../taxt_u_p_overmap_arrived.png              | Bin
 .../taxt_u_p_overmap_arriving.png             | Bin
 9 files changed, 41 insertions(+)
 rename {OCH/common/common => core/mogo-core-res}/src/main/res/drawable-nodpi/taxt_u_p_map_car.png (100%)
 rename {OCH/common/common => core/mogo-core-res}/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png (100%)
 mode change 100755 => 100644
 rename {OCH/common/common => core/mogo-core-res}/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png (100%)
 rename {OCH/common/common => core/mogo-core-res}/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png (100%)
 rename {OCH/common/common => core/mogo-core-res}/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png (100%)
 rename {OCH/common/common => core/mogo-core-res}/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png (100%)

diff --git a/core/function-impl/mogo-core-function-hmi/build.gradle b/core/function-impl/mogo-core-function-hmi/build.gradle
index 070ff29182..29756c7395 100644
--- a/core/function-impl/mogo-core-function-hmi/build.gradle
+++ b/core/function-impl/mogo-core-function-hmi/build.gradle
@@ -68,6 +68,7 @@ dependencies {
 //    debugImplementation rootProject.ext.dependencies.debugleakcanary
 //    releaseImplementation rootProject.ext.dependencies.releaseleakcanary
     implementation rootProject.ext.dependencies.arouter
+    implementation project(path: ':core:function-impl:mogo-core-function-map')
     kapt rootProject.ext.dependencies.aroutercompiler
 
     implementation rootProject.ext.dependencies.android_start_up
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml
index 270ed24cf0..316ab71171 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary.xml
@@ -5,6 +5,26 @@
     android:background="@drawable/bg_itinerary_summary"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.mogo.eagle.core.function.view.TravelRealityView
+        android:id="@+id/travelRealityView"
+        android:layout_width="@dimen/dp_618"
+        android:layout_height="@dimen/dp_988"
+        app:arrivedDrawable="@drawable/taxt_u_p_overmap_arrived"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:topPadding="52"
+        app:leftPadding="52"
+        app:bottomPadding="52"
+        app:rightPadding="52"
+        app:carDrawable="@drawable/taxt_u_p_map_car"
+        app:compassDrawable="@drawable/taxt_u_p_map_car_light"
+        app:endPointDrawable="@drawable/taxt_u_p_map_view_dir_end"
+        app:mapStyleExtraPath="over_view_style_extra.data"
+        app:mapStylePath="over_view_style.data"
+        app:resetDrawable="@null"
+        app:startPointDrawable="@drawable/taxt_u_p_map_view_dir_start"
+        app:unArrivedDrawable="@drawable/taxt_u_p_overmap_arriving" />
+
     <ImageView
         android:id="@+id/ivSummaryClose"
         android:layout_width="@dimen/dp_100"
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml
index fdbb284de8..a1ea4eaef3 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/dialog_itinerary_summary_p.xml
@@ -5,6 +5,26 @@
     android:background="@drawable/bg_itinerary_summary_p"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <com.mogo.eagle.core.function.view.TravelRealityView
+        android:id="@+id/travelRealityView"
+        android:layout_width="@dimen/dp_618"
+        android:layout_height="@dimen/dp_988"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:arrivedDrawable="@drawable/taxt_u_p_overmap_arrived"
+        app:bottomPadding="52"
+        app:leftPadding="52"
+        app:rightPadding="52"
+        app:topPadding="52"
+        app:carDrawable="@drawable/taxt_u_p_map_car"
+        app:compassDrawable="@drawable/taxt_u_p_map_car_light"
+        app:endPointDrawable="@drawable/taxt_u_p_map_view_dir_end"
+        app:mapStyleExtraPath="style_extra.data"
+        app:mapStylePath="style.data"
+        app:resetDrawable="@null"
+        app:startPointDrawable="@drawable/taxt_u_p_map_view_dir_start"
+        app:unArrivedDrawable="@drawable/taxt_u_p_overmap_arriving" />
+
     <ImageView
         android:id="@+id/ivSummaryClose"
         android:layout_width="@dimen/dp_86"
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_car.png b/core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_map_car.png
similarity index 100%
rename from OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_car.png
rename to core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_map_car.png
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png b/core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png
old mode 100755
new mode 100644
similarity index 100%
rename from OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png
rename to core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_map_car_light.png
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png b/core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png
similarity index 100%
rename from OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png
rename to core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_end.png
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png b/core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png
similarity index 100%
rename from OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png
rename to core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_map_view_dir_start.png
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png b/core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png
similarity index 100%
rename from OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png
rename to core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_overmap_arrived.png
diff --git a/OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png b/core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png
similarity index 100%
rename from OCH/common/common/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png
rename to core/mogo-core-res/src/main/res/drawable-nodpi/taxt_u_p_overmap_arriving.png