From cacf43cb05e347e54ec01e6d54d99c717d43d544 Mon Sep 17 00:00:00 2001
From: chenfufeng <chenfufeng@zhidaoauto.com>
Date: Mon, 23 Sep 2024 18:37:39 +0800
Subject: [PATCH] =?UTF-8?q?[6.7.0][Feat]=E9=AB=98=E5=BE=B7=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E5=A2=9E=E5=8A=A0=E5=9C=86=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/res/layout/taxi_base_fragment.xml    |  4 ++--
 .../function/hmi/map/ExchangeChildLayout.kt   |  8 +++----
 .../function/hmi/map/MapContainerLayout.kt    |  2 ++
 .../main/res/layout/view_map_container.xml    |  4 ++--
 .../core/function/view/TravelRealityView.kt   | 22 ++++++++++++++++++-
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
index 070c68db47..e5878e724a 100644
--- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
+++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
@@ -398,8 +398,8 @@
 
     <com.mogo.eagle.core.function.hmi.map.MapContainerLayout
         android:id="@+id/mapContainerLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="1560dp"
+        android:layout_height="1534dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         />
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/ExchangeChildLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/ExchangeChildLayout.kt
index 9f461f9006..25f6cd0136 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/ExchangeChildLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/ExchangeChildLayout.kt
@@ -134,8 +134,8 @@ class ExchangeChildLayout @JvmOverloads constructor(
 
             txPro = PropertyValuesHolder.ofFloat("translationX", 0f, bottomX - topX - minWidth * (1 - tScaleX) / 2)
             tyPro = PropertyValuesHolder.ofFloat("translationY", 0f, bottomY - topY - minHeight * (1 - tScaleY) / 2)
-            tWidthPro = PropertyValuesHolder.ofFloat("scaleX", 1f, tScaleX/1.5f)
-            tHeightPro = PropertyValuesHolder.ofFloat("scaleY", 1f, tScaleY/1.5f)
+            tWidthPro = PropertyValuesHolder.ofFloat("scaleX", 1f, tScaleX/2f)
+            tHeightPro = PropertyValuesHolder.ofFloat("scaleY", 1f, tScaleY/2f)
             alphaPro = PropertyValuesHolder.ofFloat("alpha", 1f, 0.1f)
             tOA = ObjectAnimator.ofPropertyValuesHolder(topView, tWidthPro, tHeightPro, txPro, tyPro, alphaPro)
         } else {
@@ -147,8 +147,8 @@ class ExchangeChildLayout @JvmOverloads constructor(
 
             txPro = PropertyValuesHolder.ofFloat("translationX", 0f, bottomX - topX - minWidth * (1 - tScaleX) / 2)
             tyPro = PropertyValuesHolder.ofFloat("translationY", 0f, bottomY - topY - minHeight * (1 - tScaleY) / 2)
-            tWidthPro = PropertyValuesHolder.ofFloat("scaleX", 1f, tScaleX/1.5f)
-            tHeightPro = PropertyValuesHolder.ofFloat("scaleY", 1f, tScaleY/1.5f)
+            tWidthPro = PropertyValuesHolder.ofFloat("scaleX", 1f, tScaleX/2f)
+            tHeightPro = PropertyValuesHolder.ofFloat("scaleY", 1f, tScaleY/2f)
             alphaPro = PropertyValuesHolder.ofFloat("alpha", 1f, 0.1f)
             tOA = ObjectAnimator.ofPropertyValuesHolder(bottomView, tWidthPro, tHeightPro, txPro, tyPro, alphaPro)
 
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
index 9b47dfafff..88d798552d 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/map/MapContainerLayout.kt
@@ -81,6 +81,7 @@ class MapContainerLayout @JvmOverloads constructor(
         overMapView.setOnGestureListener(object : TravelRealityView.OnGestureListener {
             override fun onSingleTap(lng: Float, lat: Float) {
                 if (!exchangeLayout.getSwapFlag()) {
+                    overMapView.setMapFlag(false)
                     exchangeLayout.swapViews()
                 }
             }
@@ -90,6 +91,7 @@ class MapContainerLayout @JvmOverloads constructor(
     override fun onMapClick(latLng: MogoLatLng?) {
         super.onMapClick(latLng)
         if (exchangeLayout.getSwapFlag()) {
+            overMapView.setMapFlag(true)
             exchangeLayout.swapViews()
         }
     }
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 5617a6b5d7..9f351d46ad 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
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="1560dp"
-    android:layout_height="1534dp"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     tools:ignore="MissingDefaultResource">
 
     <com.mogo.eagle.core.function.hmi.map.ExchangeChildLayout
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 0974cec97e..5087c98a47 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
@@ -29,6 +29,7 @@ import com.amap.api.maps.model.Marker
 import com.amap.api.maps.model.MarkerOptions
 import com.amap.api.maps.model.Polyline
 import com.amap.api.maps.model.PolylineOptions
+import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.map.MogoLocation
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 import com.mogo.eagle.core.function.api.autopilot.IMoGoPlanningRottingListener
@@ -41,13 +42,14 @@ import com.mogo.eagle.core.function.business.travelreality.Point
 import com.mogo.eagle.core.function.business.travelreality.TravelRealityModel.Companion.travelNetWorkModel
 import com.mogo.eagle.core.function.business.travelreality.view.EventVideoView
 import com.mogo.eagle.core.function.business.travelreality.view.VideoMarkerEntity
-import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ02ListenerManager
 import com.mogo.eagle.core.function.call.autopilot.CallerPlanningRottingListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.map.R
+import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils
 import com.mogo.eagle.core.utilcode.util.LocationUtils
+import com.mogo.eagle.core.widget.media.video.TextureVideoViewOutlineProvider
 import me.jessyan.autosize.utils.AutoSizeUtils
 import mogo.telematics.pad.MessagePad
 
@@ -207,6 +209,7 @@ class TravelRealityView @JvmOverloads constructor(
 
     private var listener: OnDrawListener? = null
     private var gestureListener: OnGestureListener? = null
+    private var isSmallMap: Boolean = true
 
     init {
         try {
@@ -278,6 +281,10 @@ class TravelRealityView @JvmOverloads constructor(
         this.gestureListener = listener
     }
 
+    fun setMapFlag(isSmallMap: Boolean) {
+        this.isSmallMap = isSmallMap
+    }
+
     /**
      * 清除所有Marker和Polyline
      */
@@ -400,6 +407,19 @@ class TravelRealityView @JvmOverloads constructor(
         })
     }
 
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
+            if (isSmallMap) {
+                this.outlineProvider = TextureVideoViewOutlineProvider(AutoSizeUtils.dp2px(context, 32f)
+                    .toFloat())
+                this.clipToOutline = true
+            } else {
+                this.clipToOutline = false
+            }
+        }
+    }
+
     override fun onVisibilityChanged(changedView: View, visibility: Int) {
         super.onVisibilityChanged(changedView, visibility)
         if (visibility == VISIBLE) {