From 10e7597ca4b290f6d76d187a9090e371762209e5 Mon Sep 17 00:00:00 2001 From: chenfufeng Date: Tue, 22 Oct 2024 18:59:32 +0800 Subject: [PATCH] =?UTF-8?q?[6.7.0][Fix]=E8=A7=A3=E5=86=B3=E8=A1=8C?= =?UTF-8?q?=E7=A8=8B=E6=80=BB=E8=A7=88=E8=BD=A6=E6=A8=A1=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/layout/common_overmap_view.xml | 1 + .../src/main/res/layout/taxi_p_overmap.xml | 1 + .../datacenter/biz/DataCenterBizProvider.kt | 2 +- .../res/layout/dialog_itinerary_summary.xml | 1 + .../res/layout/dialog_itinerary_summary_p.xml | 1 + .../main/res/layout/view_map_container.xml | 1 - .../core/function/view/TravelRealityView.kt | 23 +++++++++++++----- .../src/main/res/values/attrs.xml | 4 +-- .../datacenter/CallerDataCenterBizListener.kt | 13 ++++++++-- .../drawable-xhdpi/map_bus_common_icon.png | Bin 0 -> 6245 bytes 10 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 core/mogo-core-res/src/main/res/drawable-xhdpi/map_bus_common_icon.png 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 0000000000000000000000000000000000000000..39d614590f2ddb615b563cba32859ace545ecfa9 GIT binary patch literal 6245 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 P00000NkvXXu0mjf+iBKT literal 0 HcmV?d00001