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

Merge remote-tracking branch 'origin/dev_robotaxi-d_231218_6.2.6' into dev_robotaxi-d_231218_6.2.6

Browse Source
This commit is contained in:
jiaguofeng
2024-01-08 18:29:54 +08:00
parent 4e0676818e 46ea2a4bfc
commit 609a053e89
15 changed files with 79 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -17,7 +17,6 @@ import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
import com.mogo.eagle.core.utilcode.util.DeviceUtils
import com.mogo.map.listener.IMogoMapListener
import com.mogo.map.uicontroller.VisualAngleMode
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.taxi.passenger.R
@@ -140,9 +139,9 @@ class TaxiPassengerBaseFragment() :
when (bottom.getCurrentPage()) {
BottomBar.SelectView.PRECISIONMAP -> {
//切换到地图中间
mapBizView.getUI()?.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
// 切换缩放到中视角
mapBizView.getUI()?.changeZoom2(0.8f)
mapBizView.getUI()?.let {
it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null)
}
}
BottomBar.SelectView.OVERMAPVIEW -> {
overMapView.displayCustomOverView()

2
OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt
View File

@@ -128,7 +128,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback {
visibility = View.GONE
}
ObjectAnimator.ofFloat(this@ArrivedView, "alpha", alphaStart, alphaEnd).apply {
duration = 1000
duration = 500
addListener(object :AnimatorListenerAdapter(){
override fun onAnimationEnd(animation: Animator) {
d(TAG,"onAnimationEndcarrivedView")

BIN
OCH/taxi/passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 116 KiB

2
OCH/taxi/passenger/src/main/res/drawable/taxi_p_roma_distance_bg.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_60"/>
<solid android:color="@color/taxi_p_E6E5F0FF"/>
<solid android:color="@color/taxi_p_80E5F0FF"/>
</shape>

64
OCH/taxi/passenger/src/main/res/values/arrays.xml
View File

@@ -232,71 +232,71 @@
<string-array name="arrived_dest">
<item>@drawable/arrive_dest_000</item>
<item>@drawable/arrive_dest_001</item>
<!-- <item>@drawable/arrive_dest_002</item>-->
<item>@drawable/arrive_dest_003</item>
<!-- <item>@drawable/arrive_dest_000</item>-->
<!-- <item>@drawable/arrive_dest_001</item>-->
<item>@drawable/arrive_dest_002</item>
<!-- <item>@drawable/arrive_dest_003</item>-->
<item>@drawable/arrive_dest_004</item>
<!-- <item>@drawable/arrive_dest_005</item>-->
<item>@drawable/arrive_dest_006</item>
<item>@drawable/arrive_dest_007</item>
<!-- <item>@drawable/arrive_dest_008</item>-->
<item>@drawable/arrive_dest_009</item>
<!-- <item>@drawable/arrive_dest_007</item>-->
<item>@drawable/arrive_dest_008</item>
<!-- <item>@drawable/arrive_dest_009</item>-->
<item>@drawable/arrive_dest_011</item>
<item>@drawable/arrive_dest_010</item>
<!-- <item>@drawable/arrive_dest_011</item>-->
<item>@drawable/arrive_dest_012</item>
<item>@drawable/arrive_dest_013</item>
<!-- <item>@drawable/arrive_dest_014</item>-->
<item>@drawable/arrive_dest_015</item>
<!-- <item>@drawable/arrive_dest_013</item>-->
<item>@drawable/arrive_dest_014</item>
<!-- <item>@drawable/arrive_dest_015</item>-->
<item>@drawable/arrive_dest_016</item>
<!-- <item>@drawable/arrive_dest_017</item>-->
<item>@drawable/arrive_dest_018</item>
<item>@drawable/arrive_dest_019</item>
<!-- <item>@drawable/arrive_dest_019</item>-->
<!-- <item>@drawable/arrive_dest_020</item>-->
<item>@drawable/arrive_dest_021</item>
<item>@drawable/arrive_dest_020</item>
<!-- <item>@drawable/arrive_dest_021</item>-->
<item>@drawable/arrive_dest_022</item>
<!-- <item>@drawable/arrive_dest_023</item>-->
<item>@drawable/arrive_dest_024</item>
<item>@drawable/arrive_dest_025</item>
<!-- <item>@drawable/arrive_dest_026</item>-->
<item>@drawable/arrive_dest_027</item>
<!-- <item>@drawable/arrive_dest_025</item>-->
<item>@drawable/arrive_dest_026</item>
<!-- <item>@drawable/arrive_dest_027</item>-->
<item>@drawable/arrive_dest_028</item>
<!-- <item>@drawable/arrive_dest_029</item>-->
<item>@drawable/arrive_dest_030</item>
<item>@drawable/arrive_dest_031</item>
<!-- <item>@drawable/arrive_dest_032</item>-->
<item>@drawable/arrive_dest_033</item>
<!-- <item>@drawable/arrive_dest_031</item>-->
<item>@drawable/arrive_dest_032</item>
<!-- <item>@drawable/arrive_dest_033</item>-->
<item>@drawable/arrive_dest_034</item>
<!-- <item>@drawable/arrive_dest_035</item>-->
<item>@drawable/arrive_dest_036</item>
<item>@drawable/arrive_dest_037</item>
<!-- <item>@drawable/arrive_dest_038</item>-->
<item>@drawable/arrive_dest_039</item>
<!-- <item>@drawable/arrive_dest_037</item>-->
<item>@drawable/arrive_dest_038</item>
<!-- <item>@drawable/arrive_dest_039</item>-->
<item>@drawable/arrive_dest_040</item>
<!-- <item>@drawable/arrive_dest_041</item>-->
<item>@drawable/arrive_dest_042</item>
<item>@drawable/arrive_dest_043</item>
<!-- <item>@drawable/arrive_dest_044</item>-->
<item>@drawable/arrive_dest_045</item>
<!-- <item>@drawable/arrive_dest_043</item>-->
<item>@drawable/arrive_dest_044</item>
<!-- <item>@drawable/arrive_dest_045</item>-->
<item>@drawable/arrive_dest_046</item>
<!-- <item>@drawable/arrive_dest_047</item>-->
<item>@drawable/arrive_dest_048</item>
<item>@drawable/arrive_dest_049</item>
<!-- <item>@drawable/arrive_dest_049</item>-->
<!-- <item>@drawable/arrive_dest_050</item>-->
<item>@drawable/arrive_dest_051</item>
<item>@drawable/arrive_dest_050</item>
<!-- <item>@drawable/arrive_dest_051</item>-->
<item>@drawable/arrive_dest_052</item>
<!-- <item>@drawable/arrive_dest_053</item>-->
<item>@drawable/arrive_dest_054</item>
<item>@drawable/arrive_dest_055</item>
<!-- <item>@drawable/arrive_dest_056</item>-->
<item>@drawable/arrive_dest_057</item>
<!-- <item>@drawable/arrive_dest_055</item>-->
<item>@drawable/arrive_dest_056</item>
<!-- <item>@drawable/arrive_dest_057</item>-->
<item>@drawable/arrive_dest_058</item>
<!-- <item>@drawable/arrive_dest_059</item>-->

1
OCH/taxi/passenger/src/main/res/values/colors.xml
View File

@@ -53,6 +53,7 @@
<color name="taxi_p_333333">#333333</color>
<color name="taxi_p_373B46">#373B46</color>
<color name="taxi_p_80E5F0FF">#80E5F0FF</color>
<color name="taxi_p_E6E5F0FF">#E6E5F0FF</color>
<color name="taxi_p_4D7985A7">#4D7985A7</color>

10
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -12,13 +12,11 @@ import com.mogo.commons.voice.AIAssist
import com.mogo.eagle.core.data.constants.MogoServicePaths
import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_TAXI_P
import com.mogo.eagle.core.utilcode.util.DeviceUtils
import com.mogo.map.listener.IMogoMapListener
import com.mogo.map.uicontroller.VisualAngleMode
import com.mogo.och.common.module.utils.RxUtils
import com.mogo.och.common.module.voice.VoiceNotice
import com.mogo.och.taxi.passenger.R
@@ -155,12 +153,8 @@ class TaxiPassengerBaseFragment() :
rv_location_center.onClick {
when (bottom.getCurrentPage()) {
BottomBar.SelectView.PRECISIONMAP -> {
val controller = CallerMapUIServiceManager.getMapUIController()
if (controller != null) {
//切换到地图中间
controller.changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null)
// 切换缩放到中视角
controller.changeZoom2(0.8f)
mapBizView.getUI()?.let {
it.changeMapVisualAngle(it.getVrAngleDefaultMode(), null)
}
}
BottomBar.SelectView.OVERMAPVIEW -> {

2
OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt
View File

@@ -131,7 +131,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback {
visibility = View.GONE
}
ObjectAnimator.ofFloat(this@ArrivedView, "alpha", alphaStart, alphaEnd).apply {
duration = 1000
duration = 500
addListener(object :AnimatorListenerAdapter(){
override fun onAnimationEnd(animation: Animator) {
CallerLogger.d(TaxiPassengerBaseFragment.TAG,"onAnimationEndcarrivedView")

BIN
OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 116 KiB

2
OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_roma_distance_bg.xml
View File

@@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_60"/>
<solid android:color="@color/taxi_p_E6E5F0FF"/>
<solid android:color="@color/taxi_p_80E5F0FF"/>
</shape>

65
OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml
View File

@@ -232,77 +232,78 @@
<string-array name="arrived_dest">
<item>@drawable/arrive_dest_000</item>
<item>@drawable/arrive_dest_001</item>
<!-- <item>@drawable/arrive_dest_002</item>-->
<item>@drawable/arrive_dest_003</item>
<!-- <item>@drawable/arrive_dest_000</item>-->
<!-- <item>@drawable/arrive_dest_001</item>-->
<item>@drawable/arrive_dest_002</item>
<!-- <item>@drawable/arrive_dest_003</item>-->
<item>@drawable/arrive_dest_004</item>
<!-- <item>@drawable/arrive_dest_005</item>-->
<item>@drawable/arrive_dest_006</item>
<item>@drawable/arrive_dest_007</item>
<!-- <item>@drawable/arrive_dest_008</item>-->
<item>@drawable/arrive_dest_009</item>
<!-- <item>@drawable/arrive_dest_007</item>-->
<item>@drawable/arrive_dest_008</item>
<!-- <item>@drawable/arrive_dest_009</item>-->
<item>@drawable/arrive_dest_011</item>
<item>@drawable/arrive_dest_010</item>
<!-- <item>@drawable/arrive_dest_011</item>-->
<item>@drawable/arrive_dest_012</item>
<item>@drawable/arrive_dest_013</item>
<!-- <item>@drawable/arrive_dest_014</item>-->
<item>@drawable/arrive_dest_015</item>
<!-- <item>@drawable/arrive_dest_013</item>-->
<item>@drawable/arrive_dest_014</item>
<!-- <item>@drawable/arrive_dest_015</item>-->
<item>@drawable/arrive_dest_016</item>
<!-- <item>@drawable/arrive_dest_017</item>-->
<item>@drawable/arrive_dest_018</item>
<item>@drawable/arrive_dest_019</item>
<!-- <item>@drawable/arrive_dest_019</item>-->
<!-- <item>@drawable/arrive_dest_020</item>-->
<item>@drawable/arrive_dest_021</item>
<item>@drawable/arrive_dest_020</item>
<!-- <item>@drawable/arrive_dest_021</item>-->
<item>@drawable/arrive_dest_022</item>
<!-- <item>@drawable/arrive_dest_023</item>-->
<item>@drawable/arrive_dest_024</item>
<item>@drawable/arrive_dest_025</item>
<!-- <item>@drawable/arrive_dest_026</item>-->
<item>@drawable/arrive_dest_027</item>
<!-- <item>@drawable/arrive_dest_025</item>-->
<item>@drawable/arrive_dest_026</item>
<!-- <item>@drawable/arrive_dest_027</item>-->
<item>@drawable/arrive_dest_028</item>
<!-- <item>@drawable/arrive_dest_029</item>-->
<item>@drawable/arrive_dest_030</item>
<item>@drawable/arrive_dest_031</item>
<!-- <item>@drawable/arrive_dest_032</item>-->
<item>@drawable/arrive_dest_033</item>
<!-- <item>@drawable/arrive_dest_031</item>-->
<item>@drawable/arrive_dest_032</item>
<!-- <item>@drawable/arrive_dest_033</item>-->
<item>@drawable/arrive_dest_034</item>
<!-- <item>@drawable/arrive_dest_035</item>-->
<item>@drawable/arrive_dest_036</item>
<item>@drawable/arrive_dest_037</item>
<!-- <item>@drawable/arrive_dest_038</item>-->
<item>@drawable/arrive_dest_039</item>
<!-- <item>@drawable/arrive_dest_037</item>-->
<item>@drawable/arrive_dest_038</item>
<!-- <item>@drawable/arrive_dest_039</item>-->
<item>@drawable/arrive_dest_040</item>
<!-- <item>@drawable/arrive_dest_041</item>-->
<item>@drawable/arrive_dest_042</item>
<item>@drawable/arrive_dest_043</item>
<!-- <item>@drawable/arrive_dest_044</item>-->
<item>@drawable/arrive_dest_045</item>
<!-- <item>@drawable/arrive_dest_043</item>-->
<item>@drawable/arrive_dest_044</item>
<!-- <item>@drawable/arrive_dest_045</item>-->
<item>@drawable/arrive_dest_046</item>
<!-- <item>@drawable/arrive_dest_047</item>-->
<item>@drawable/arrive_dest_048</item>
<item>@drawable/arrive_dest_049</item>
<!-- <item>@drawable/arrive_dest_049</item>-->
<!-- <item>@drawable/arrive_dest_050</item>-->
<item>@drawable/arrive_dest_051</item>
<item>@drawable/arrive_dest_050</item>
<!-- <item>@drawable/arrive_dest_051</item>-->
<item>@drawable/arrive_dest_052</item>
<!-- <item>@drawable/arrive_dest_053</item>-->
<item>@drawable/arrive_dest_054</item>
<item>@drawable/arrive_dest_055</item>
<!-- <item>@drawable/arrive_dest_056</item>-->
<item>@drawable/arrive_dest_057</item>
<!-- <item>@drawable/arrive_dest_055</item>-->
<item>@drawable/arrive_dest_056</item>
<!-- <item>@drawable/arrive_dest_057</item>-->
<item>@drawable/arrive_dest_058</item>
<!-- <item>@drawable/arrive_dest_059</item>-->
<item>@drawable/arrive_dest_060</item>
</string-array>
<string-array name="check2startautopilt">
<item>@drawable/check2startautopilt_000</item>
<item>@drawable/check2startautopilt_001</item>

1
OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml
View File

@@ -61,6 +61,7 @@
<color name="taxi_p_58C9FF">#58C9FF</color>
<color name="taxi_p_477CFC">#477CFC</color>
<color name="taxi_p_A0B3DA">#A0B3DA</color>
<color name="taxi_p_80E5F0FF">#80E5F0FF</color>
<color name="taxi_p_E6E5F0FF">#E6E5F0FF</color>
<color name="taxi_p_4D7985A7">#4D7985A7</color>

2
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_taxi_p.xml
View File

@@ -2,6 +2,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#E6E5F0FF"/>
<solid android:color="#80E5F0FF"/>
<corners android:radius="@dimen/hmi_traffic_light_layout_corner"/>
</shape>

2
core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turn_light_background_taxi_p.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#E6E5F0FF" />
<solid android:color="#80E5F0FF" />
<corners android:radius="@dimen/turnlight_bg_corner" />
</shape>

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml
View File

@@ -4,7 +4,7 @@
android:layout_width="@dimen/dp_600"
android:layout_height="@dimen/dp_138"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="#FFCEDCF7"
android:background="#8CF5FAFF"
app:roundLayoutRadius="24dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"