diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 1f62d60cac..5a44675a58 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -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() diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 58b6506126..f335b76534 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -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") diff --git a/OCH/taxi/passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp b/OCH/taxi/passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp deleted file mode 100644 index 542c400274..0000000000 Binary files a/OCH/taxi/passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp and /dev/null differ diff --git a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_roma_distance_bg.xml b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_roma_distance_bg.xml index 05ebb05f2e..20ccf3f45e 100644 --- a/OCH/taxi/passenger/src/main/res/drawable/taxi_p_roma_distance_bg.xml +++ b/OCH/taxi/passenger/src/main/res/drawable/taxi_p_roma_distance_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/taxi/passenger/src/main/res/values/arrays.xml b/OCH/taxi/passenger/src/main/res/values/arrays.xml index 29e26a527f..6c3d9f93ce 100644 --- a/OCH/taxi/passenger/src/main/res/values/arrays.xml +++ b/OCH/taxi/passenger/src/main/res/values/arrays.xml @@ -232,71 +232,71 @@ - @drawable/arrive_dest_000 - @drawable/arrive_dest_001 - - @drawable/arrive_dest_003 + + + @drawable/arrive_dest_002 + @drawable/arrive_dest_004 @drawable/arrive_dest_006 - @drawable/arrive_dest_007 - - @drawable/arrive_dest_009 + + @drawable/arrive_dest_008 + - @drawable/arrive_dest_011 + @drawable/arrive_dest_010 @drawable/arrive_dest_012 - @drawable/arrive_dest_013 - - @drawable/arrive_dest_015 + + @drawable/arrive_dest_014 + @drawable/arrive_dest_016 @drawable/arrive_dest_018 - @drawable/arrive_dest_019 + - - @drawable/arrive_dest_021 + @drawable/arrive_dest_020 + @drawable/arrive_dest_022 @drawable/arrive_dest_024 - @drawable/arrive_dest_025 - - @drawable/arrive_dest_027 + + @drawable/arrive_dest_026 + @drawable/arrive_dest_028 @drawable/arrive_dest_030 - @drawable/arrive_dest_031 - - @drawable/arrive_dest_033 + + @drawable/arrive_dest_032 + @drawable/arrive_dest_034 @drawable/arrive_dest_036 - @drawable/arrive_dest_037 - - @drawable/arrive_dest_039 + + @drawable/arrive_dest_038 + @drawable/arrive_dest_040 @drawable/arrive_dest_042 - @drawable/arrive_dest_043 - - @drawable/arrive_dest_045 + + @drawable/arrive_dest_044 + @drawable/arrive_dest_046 @drawable/arrive_dest_048 - @drawable/arrive_dest_049 + - - @drawable/arrive_dest_051 + @drawable/arrive_dest_050 + @drawable/arrive_dest_052 @drawable/arrive_dest_054 - @drawable/arrive_dest_055 - - @drawable/arrive_dest_057 + + @drawable/arrive_dest_056 + @drawable/arrive_dest_058 diff --git a/OCH/taxi/passenger/src/main/res/values/colors.xml b/OCH/taxi/passenger/src/main/res/values/colors.xml index fdb2587742..315208e607 100644 --- a/OCH/taxi/passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/passenger/src/main/res/values/colors.xml @@ -53,6 +53,7 @@ #333333 #373B46 + #80E5F0FF #E6E5F0FF #4D7985A7 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 1da220d355..71d1752033 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -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 -> { diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 0b47161aae..4ecf8eac00 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -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") diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp b/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp deleted file mode 100644 index 542c400274..0000000000 Binary files a/OCH/taxi/unmanned-passenger/src/main/res/drawable-nodpi/arrive_dest_000.webp and /dev/null differ diff --git a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_roma_distance_bg.xml b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_roma_distance_bg.xml index 05ebb05f2e..20ccf3f45e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_roma_distance_bg.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/drawable/taxi_u_p_roma_distance_bg.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml index 04c94c32cd..ef97d83ff0 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/arrays.xml @@ -232,77 +232,78 @@ - @drawable/arrive_dest_000 - @drawable/arrive_dest_001 - - @drawable/arrive_dest_003 + + + @drawable/arrive_dest_002 + @drawable/arrive_dest_004 @drawable/arrive_dest_006 - @drawable/arrive_dest_007 - - @drawable/arrive_dest_009 + + @drawable/arrive_dest_008 + - @drawable/arrive_dest_011 + @drawable/arrive_dest_010 @drawable/arrive_dest_012 - @drawable/arrive_dest_013 - - @drawable/arrive_dest_015 + + @drawable/arrive_dest_014 + @drawable/arrive_dest_016 @drawable/arrive_dest_018 - @drawable/arrive_dest_019 + - - @drawable/arrive_dest_021 + @drawable/arrive_dest_020 + @drawable/arrive_dest_022 @drawable/arrive_dest_024 - @drawable/arrive_dest_025 - - @drawable/arrive_dest_027 + + @drawable/arrive_dest_026 + @drawable/arrive_dest_028 @drawable/arrive_dest_030 - @drawable/arrive_dest_031 - - @drawable/arrive_dest_033 + + @drawable/arrive_dest_032 + @drawable/arrive_dest_034 @drawable/arrive_dest_036 - @drawable/arrive_dest_037 - - @drawable/arrive_dest_039 + + @drawable/arrive_dest_038 + @drawable/arrive_dest_040 @drawable/arrive_dest_042 - @drawable/arrive_dest_043 - - @drawable/arrive_dest_045 + + @drawable/arrive_dest_044 + @drawable/arrive_dest_046 @drawable/arrive_dest_048 - @drawable/arrive_dest_049 + - - @drawable/arrive_dest_051 + @drawable/arrive_dest_050 + @drawable/arrive_dest_052 @drawable/arrive_dest_054 - @drawable/arrive_dest_055 - - @drawable/arrive_dest_057 + + @drawable/arrive_dest_056 + @drawable/arrive_dest_058 @drawable/arrive_dest_060 + @drawable/check2startautopilt_000 @drawable/check2startautopilt_001 diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml index 59672dcfdf..2f3f368f0e 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml @@ -61,6 +61,7 @@ #58C9FF #477CFC #A0B3DA + #80E5F0FF #E6E5F0FF #4D7985A7 diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_taxi_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_taxi_p.xml index 04778a8c33..6a76b42c41 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_taxi_p.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/traffic_light_bg_taxi_p.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turn_light_background_taxi_p.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turn_light_background_taxi_p.xml index 03fe074e77..cbbeee5a59 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turn_light_background_taxi_p.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/drawable/turn_light_background_taxi_p.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml index d521d54f62..be936c2d1c 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/item_passenger_msg_box_v2x.xml @@ -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"