From 4522dc2ec4a09660bdee17e5ddb29bb313a819c6 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Mon, 15 Jul 2024 19:41:41 +0800
Subject: [PATCH] =?UTF-8?q?[6.5.0][=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6]?=
 =?UTF-8?q?=20ui=E8=B5=B0=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt  | 2 +-
 .../src/main/res/drawable/bg_green_wave_driver.xml              | 2 +-
 .../src/main/res/drawable/bg_green_wave_passenger.xml           | 2 +-
 .../src/main/res/layout/view_green_wave_driver_layout.xml       | 2 ++
 .../src/main/res/layout/view_green_wave_passenger_layout.xml    | 2 ++
 .../mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl      | 2 --
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
index d27373bc91..1d0f038c63 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/v2n/scenario/scene/airoad/AiRoadMarker.kt
@@ -115,7 +115,7 @@ class AiRoadMarker {
                 .longitude(marker.poi_lon)
                 .latitude(marker.poi_lat)
             if (marker.poiType == EventTypeEnumNew.TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType) {
-                builder.anchorColor("#D6E1BA9A")
+                builder.anchorColor("#FFE1BA9A")
             }
             CallerMapUIServiceManager.getOverlayManager()?.showOrUpdatePoint(builder.build())?.let { p ->
                 if (!markerIds.contains(markerId)) {
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_green_wave_driver.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_green_wave_driver.xml
index 90ed9a6e67..4bf9d4c74a 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_green_wave_driver.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_green_wave_driver.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/dp_16" />
+    <corners android:radius="@dimen/dp_20" />
     <solid android:color="#43D1A6" />
 </shape>
\ No newline at end of file
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_green_wave_passenger.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_green_wave_passenger.xml
index 3bea23da6e..192997148f 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_green_wave_passenger.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/bg_green_wave_passenger.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="@dimen/dp_16" />
+    <corners android:radius="@dimen/dp_20" />
     <gradient
         android:startColor="#68E0BB"
         android:endColor="#b072ECC3"/>
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_green_wave_driver_layout.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_green_wave_driver_layout.xml
index e1a921c747..713b665996 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_green_wave_driver_layout.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_green_wave_driver_layout.xml
@@ -25,6 +25,7 @@
             android:layout_marginBottom="-5dp"
             android:textColor="#43D1AB"
             android:textSize="@dimen/sp_34"
+            android:fontFamily="@font/font_din"
             tools:text="56" />
 
         <TextView
@@ -62,6 +63,7 @@
                 android:layout_marginBottom="@dimen/dp_4"
                 android:textColor="#ffffff"
                 android:textSize="@dimen/dp_30"
+                android:textStyle="bold"
                 tools:text="建议车速45-60km/h" />
 
             <TextView
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_green_wave_passenger_layout.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_green_wave_passenger_layout.xml
index c4d12ad34f..d8fa23b441 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_green_wave_passenger_layout.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_green_wave_passenger_layout.xml
@@ -25,6 +25,7 @@
             android:textSize="@dimen/dp_49"
             android:textColor="#0F664B"
             android:layout_marginBottom="-5dp"
+            android:fontFamily="@font/font_din"
             tools:text="56"/>
 
         <TextView
@@ -61,6 +62,7 @@
                 android:textSize="@dimen/dp_33"
                 android:textColor="#004A35"
                 android:layout_marginBottom="@dimen/dp_4"
+                android:textStyle="bold"
                 tools:text="建议车速45-60km/h" />
 
             <TextView
diff --git a/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl b/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl
index f9a4d8482d..971d40f522 100644
--- a/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl
+++ b/libraries/mapmodule/src/main/assets/shaders/fSelfCar_Shader.glsl
@@ -101,8 +101,6 @@ void setBlur()
 void main()
 {
     //点光源光照Blinn-Phong模型
-    fragColor = texture(texId,fragTexCoord);
-    return;
     vec3 L = normalize(fragEyePos - lightEyePos); //光源到此片元的方向
     vec3 N = normalize(fragEyeNormal); //此片元法线
     vec3 V = normalize(fragEyePos); //眼睛观察此片元的方向