yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tmp_6.7.0_arrow' into dev_robotaxi-d_240912_6.7.0

Browse Source
This commit is contained in:
EmArrow
2024-09-13 02:54:44 +08:00
parent 4769367d4d a995ad91fa
commit 30efddab7e
79 changed files with 1381 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/bus/driver/src/main/res/layout/bus_base_fragment.xml
View File

@@ -107,7 +107,7 @@
app:layout_goneMarginEnd="40dp"
app:layout_goneMarginTop="@dimen/dp_236" />
<com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
<com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
android:layout_marginTop="@dimen/dp_71"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
OCH/charter/driver/src/main/res/layout/charter_base_fragment.xml
View File

@@ -114,7 +114,7 @@
android:visibility="invisible"
app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
<com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
<com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_71"

2
OCH/shuttle/driver/src/main/res/layout/shuttle_base_fragment.xml
View File

@@ -104,7 +104,7 @@
android:visibility="invisible"
app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
<com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
<com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_71"

2
OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
View File

@@ -104,7 +104,7 @@
android:visibility="invisible"
app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
<com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
<com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_71"

67
OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml
View File

@@ -139,7 +139,7 @@
app:layout_goneMarginEnd="40dp"
app:layout_goneMarginTop="@dimen/dp_236" />
<com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
<com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
android:layout_width="@dimen/dp_580"
android:layout_height="@dimen/dp_129"
android:layout_marginTop="@dimen/dp_71"
@@ -164,35 +164,33 @@
android:id="@+id/roadV2NEventWindowView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_45"
android:layout_marginTop="@dimen/dp_350"
android:layout_marginRight="@dimen/dp_45"
android:visibility="gone"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:visibility="gone"/>
app:layout_constraintTop_toTopOf="parent" />
<!--自动探查-->
<com.mogo.och.common.module.wigets.rodedata.OchAutomaticExplorationView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_350"
android:layout_marginRight="@dimen/dp_50"
app:explorationUser="driver"
android:visibility="gone"
/>
app:explorationUser="driver"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--红绿灯提醒-->
<com.mogo.eagle.core.function.hmi.ui.notice.traffic.TrafficLightPromptView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_350"
android:layout_marginRight="@dimen/dp_50"
app:promptUser="driver"
android:visibility="gone"
/>
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:promptUser="driver" />
<!-- 地图marker点击触发路侧直播 -->
<com.mogo.eagle.core.function.hmi.ui.camera.RoadCrossLiveView
@@ -246,13 +244,12 @@
<com.mogo.eagle.core.function.hmi.ui.widget.FusionTrafficLightView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
android:visibility="gone"
app:fusionLightUser="driver"
/>
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--接管提示-->
<com.mogo.eagle.core.function.hmi.ui.vehicle.TakeOverView
@@ -278,12 +275,12 @@
<com.mogo.och.common.module.wigets.map.switchvisual.VisualViewDirver
android:id="@+id/vvd_change_angle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/toolsView"
android:layout_marginBottom="@dimen/dp_48"
android:layout_marginStart="@dimen/dp_618"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_618"
android:layout_marginBottom="@dimen/dp_48"
app:layout_constraintBottom_toTopOf="@+id/toolsView"
app:layout_constraintStart_toStartOf="parent" />
<com.mogo.och.common.module.wigets.map.orderstatus.OrderStatusView
@@ -338,12 +335,12 @@
<com.mogo.och.common.module.wigets.map.drawline.LineView
android:id="@+id/lineView"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/rtv_switch"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"
android:layout_marginStart="-11dp"
android:layout_marginBottom="@dimen/dp_17"
android:layout_width="@dimen/dp_142"
android:layout_height="@dimen/dp_142"/>
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/rtv_switch" />
<com.mogo.eagle.core.function.hmi.ui.widget.RomaDistanceView
android:layout_width="wrap_content"
@@ -424,14 +421,14 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/aciv_show_guid"
app:layout_constraintStart_toStartOf="@+id/smallMapView"
app:layout_constraintEnd_toEndOf="@+id/smallMapView"
app:layout_constraintBottom_toTopOf="@+id/smallMapView"
android:layout_width="@dimen/dp_209"
android:layout_height="@dimen/dp_91"
android:layout_marginBottom="-32dp"
android:src="@drawable/taxi_overmap_tag"
android:visibility="gone"
android:layout_marginBottom="-32dp"
android:layout_width="@dimen/dp_209"
android:layout_height="@dimen/dp_91"/>
app:layout_constraintBottom_toTopOf="@+id/smallMapView"
app:layout_constraintEnd_toEndOf="@+id/smallMapView"
app:layout_constraintStart_toStartOf="@+id/smallMapView" />
<com.mogo.eagle.core.function.smp.view.SmallMapView
android:id="@+id/smallMapView"
@@ -456,4 +453,12 @@
app:layout_constraintStart_toStartOf="parent" />
<com.mogo.eagle.core.function.hmi.bone.BoneContainerView
android:id="@+id/boneContainerView"
android:layout_width="@dimen/dp_1046"
android:layout_height="match_parent"
android:elevation="100dp"
android:visibility="visible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -255,7 +255,7 @@
app:layout_constraintBottom_toTopOf="@id/aciv_xiaozhi_normal"
app:layout_constraintEnd_toEndOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
<com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
android:layout_width="@dimen/dp_580"
android:layout_height="@dimen/dp_156"
android:layout_marginEnd="@dimen/dp_30"

11
OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml
View File

@@ -138,7 +138,7 @@
android:visibility="invisible"
app:layout_constraintTop_toBottomOf="@+id/viewLimitingVelocity"/>
<com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
<com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
android:layout_width="@dimen/dp_580"
android:layout_height="@dimen/dp_129"
android:layout_marginTop="@dimen/dp_71"
@@ -459,5 +459,12 @@
app:layout_constraintStart_toStartOf="parent"
/>
<com.mogo.eagle.core.function.hmi.bone.BoneContainerView
android:id="@+id/boneContainerView"
android:layout_width="@dimen/dp_1046"
android:layout_height="match_parent"
android:elevation="100dp"
android:visibility="visible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml
View File

@@ -266,7 +266,7 @@
android:layout_marginBottom="-80dp"
app:layout_constraintEnd_toEndOf="parent" />
<com.mogo.eagle.core.function.hmi.ui.greenwave.GreenWaveView
<com.mogo.eagle.core.function.hmi.ui.widget.GreenWaveView
android:layout_width="@dimen/dp_580"
android:layout_height="@dimen/dp_156"
android:layout_marginEnd="@dimen/dp_30"