diff --git a/OCH/common/common/src/main/res/layout/common_overmap_view.xml b/OCH/common/common/src/main/res/layout/common_overmap_view.xml
index c487ceac0f..e3eb9a9b50 100644
--- a/OCH/common/common/src/main/res/layout/common_overmap_view.xml
+++ b/OCH/common/common/src/main/res/layout/common_overmap_view.xml
@@ -18,6 +18,7 @@
app:endPointDrawable="@drawable/taxi_overmap_endpoint"
app:mapStyleExtraPath="over_view_style_extra.data"
app:mapStylePath="over_view_style.data"
+ app:isOrderEnd="true"
app:resetDrawable="@null"
app:leftPadding="70"
app:topPadding="70"
diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml
index 86e07653c9..96017b653f 100644
--- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml
+++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_overmap.xml
@@ -22,6 +22,7 @@
app:rightPadding="580"
app:startPointDrawable="@drawable/taxt_u_p_map_view_dir_start"
app:topPadding="210"
+ app:isOrderEnd="true"
app:unArrivedDrawable="@drawable/taxt_u_p_overmap_arriving" />
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 2ef77eb093..8c8a755128 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
@@ -32,6 +32,7 @@
app:mapStyleExtraPath="style_extra.data"
app:mapStylePath="style.data"
app:resetDrawable="@null"
+ app:isOrderEnd="true"
app:startPointDrawable="@drawable/taxt_u_p_map_view_dir_start"
app:unArrivedDrawable="@drawable/taxt_u_p_overmap_arriving" />
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 66f88e0add..71e98b3e88 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
@@ -26,7 +26,6 @@
android:layout_marginStart="1530dp"
android:layout_marginTop="1204dp"
app:bottomPadding="160"
- app:carDrawable="@drawable/taxt_u_p_map_car"
app:compassDrawable="@drawable/taxt_u_p_map_car_light"
app:endPointDrawable="@drawable/taxi_overmap_endpoint"
app:globalPathColor="#39BA90"
diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
index c6121f8d86..7ee7695eda 100644
--- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
+++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/TravelRealityView.kt
@@ -151,7 +151,8 @@ class TravelRealityView @JvmOverloads constructor(
private var topPadding: Int = 150
private var rightPadding: Int = 100
private var bottomPadding: Int = 300
- private var isSmaller = false
+ // 订单结束弹窗
+ private var isOrderEnd = false
// 绘制智慧道路的范围
private var roadRange = 56f
@@ -275,7 +276,7 @@ class TravelRealityView @JvmOverloads constructor(
topPadding = typedArray.getInt(R.styleable.TravelRealityView_topPadding, 0)
rightPadding = typedArray.getInt(R.styleable.TravelRealityView_rightPadding, 0)
bottomPadding = typedArray.getInt(R.styleable.TravelRealityView_bottomPadding, 0)
- isSmaller = typedArray.getBoolean(R.styleable.TravelRealityView_isSmaller, false)
+ isOrderEnd = typedArray.getBoolean(R.styleable.TravelRealityView_isOrderEnd, false)
typedArray.recycle()
initView(context)
} catch (e: Exception) {
@@ -393,8 +394,13 @@ class TravelRealityView @JvmOverloads constructor(
BitmapDescriptorFactory.fromResource(if (roadRangeDrawable != -1) roadRangeDrawable else R.drawable.mogo_road_over)
roadTrajectoryBitmap =
BitmapDescriptorFactory.fromResource(if (roadTrajectoryDrawable != -1) roadTrajectoryDrawable else R.drawable.road_trajectory_arrow_nor)
-// initTravelRealityMapView()
- initSmallMapView(true)
+ if (!isOrderEnd) {
+ isSmallMap = true
+ initSmallMapView(true)
+ } else {
+ isSmallMap = false
+ initTravelRealityMapView(true)
+ }
}
private fun changeMapSettings(isSmallMap: Boolean) {
@@ -644,7 +650,7 @@ class TravelRealityView @JvmOverloads constructor(
roadTrackList = it
isRoadTrackReq = false
// 司机屏默认显示小地图的渲染，乘客屏默认显示行程总览地图的渲染
- if (!AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) || !isSmallMap) {
+ if (!AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode) || isOrderEnd || !isSmallMap) {
handleRoadTrajectories(it, reqData)
}
}, onError = {
@@ -1900,8 +1906,13 @@ class TravelRealityView @JvmOverloads constructor(
mCarMarker!!.rotateAngle = angle
mCarMarker!!.position = latLng
} else {
+ val carRes = if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
+ R.drawable.map_car_icon
+ } else {
+ R.drawable.map_bus_common_icon
+ }
val option = MarkerOptions()
- .icon(BitmapDescriptorFactory.fromResource(if (carDrawable != -1) carDrawable else R.drawable.map_car_icon))
+ .icon(BitmapDescriptorFactory.fromResource(if (carDrawable != -1) carDrawable else carRes))
.rotateAngle(360 - location.heading.toFloat())
.position(LatLng(location.latitude, location.longitude))
.anchor(0.5f, 0.5f)
diff --git a/core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml b/core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml
index 77b7473f4d..30f7536574 100644
--- a/core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml
+++ b/core/function-impl/mogo-core-function-map/src/main/res/values/attrs.xml
@@ -73,7 +73,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt
index 68d2b64794..a2c1e78652 100644
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/datacenter/CallerDataCenterBizListener.kt
@@ -1,5 +1,6 @@
package com.mogo.eagle.core.function.call.datacenter
+import com.mogo.eagle.core.data.enums.Carmodel
import com.mogo.eagle.core.data.map.MogoLocation
import com.mogo.eagle.core.data.och.OchInfo
import com.mogo.eagle.core.function.api.datacenter.IDataCenterBizListener
@@ -8,6 +9,9 @@ import java.util.concurrent.atomic.AtomicBoolean
object CallerDataCenterBizListener : CallerBase() {
+ @Volatile
+ private var carModel: Carmodel? = null
+
@Volatile
private var res: Int = 0
@@ -41,8 +45,9 @@ object CallerDataCenterBizListener : CallerBase() {
}
}
- fun invokeCarRes(res: Int) {
- this.res = res
+ fun invokeCarModel(carModel: Carmodel) {
+ this.carModel = carModel
+ this.res = carModel.resId
M_LISTENERS.forEach {
it.value.invokeCarRes(res)
}
@@ -107,4 +112,8 @@ object CallerDataCenterBizListener : CallerBase() {
fun getOrderId(): String {
return orderId
}
+
+ fun getCarModel(): Carmodel? {
+ return carModel
+ }
}
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/map_bus_common_icon.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/map_bus_common_icon.png
new file mode 100644
index 0000000000..39d614590f
Binary files /dev/null and b/core/mogo-core-res/src/main/res/drawable-xhdpi/map_bus_common_icon.png differ