diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml index e8cbfbfcff..7df67a0da3 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_base_fragment.xml @@ -194,10 +194,9 @@ @@ -228,10 +227,9 @@ @@ -241,7 +239,7 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="-80dp" + android:layout_marginBottom="-100dp" app:layout_constraintBottom_toTopOf="@+id/aciv_xiaozhi_normal" app:layout_constraintRight_toRightOf="parent" android:visibility="gone"/> diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index 2ce34582f8..9051d1a9eb 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -98,10 +98,9 @@ @@ -120,10 +119,9 @@ @@ -252,7 +250,7 @@ android:id="@+id/roadV2NEventWindowView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="-80dp" + android:layout_marginBottom="-100dp" app:layout_constraintBottom_toTopOf="@+id/aciv_xiaozhi_normal" app:layout_constraintRight_toRightOf="parent" android:visibility="gone"/> diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt index 399b1cd12f..3159c87f95 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasListenerImpl.kt @@ -1038,7 +1038,7 @@ class MoGoAdasListenerImpl : OnAdasListener { if (unableAutopilotReasons != null) { reason = unableAutopilotReasons.toString() } - autopilotAbilityCheck(isAutopilotAbility, reason, launchConditionData) + autopilotAbilityCheck(isAutopilotAbility, reason, launchConditionData.json) invokeAutopilotAbility(isAutopilotAbility, launchConditionData, unableAutopilotReasons) } @@ -1064,7 +1064,7 @@ class MoGoAdasListenerImpl : OnAdasListener { nodeAliasCode = CHAIN_CODE_ADAS_ABILITY, paramIndexes = [0, 1, 2] ) - private fun autopilotAbilityCheck(isAutopilotAbility: Boolean, reason: String, launchConditionData: LaunchConditionData) { + private fun autopilotAbilityCheck(isAutopilotAbility: Boolean, reason: String, launchConditionDataJson: String) { } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml index 18c4abd984..3ce9c47f90 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_road_cross_live_light.xml @@ -4,17 +4,18 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:background="@drawable/bg_hmi_nor_test_light"> + android:background="@drawable/bg_right_base_light"> + android:layout_marginStart="@dimen/dp_30" + app:layout_constraintLeft_toLeftOf="parent"/> val value = animation.animatedValue as Int @@ -204,6 +204,7 @@ class RoadCrossRoamView @JvmOverloads constructor( if (CallerMapIdentifyManager.roam.first != TAG) { ToastUtils.showLong("正在漫游中,不展示路口漫游") } + CallerLogger.d("$M_MAP$TAG","正在漫游中,不展示路口漫游") return } // 首页被遮挡不做提示 @@ -213,7 +214,6 @@ class RoadCrossRoamView @JvmOverloads constructor( } CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG) bringToFront() - CallerMapIdentifyManager.roam = Pair(TAG, true) this.visibility = View.VISIBLE ivZhiRoadRoamView.visibility = View.VISIBLE mapRoamView.visibility = View.VISIBLE @@ -265,7 +265,7 @@ class RoadCrossRoamView @JvmOverloads constructor( } mapRoamView.closeRoam() mapRoamView.visibility = View.GONE - CallerMapIdentifyManager.roam = Pair("", false) + lvRoadCrossRoamTip.adapter = null animator?.cancel() if (lightMode) { @@ -273,7 +273,7 @@ class RoadCrossRoamView @JvmOverloads constructor( } if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && animScale) { - setHeight(AutoSizeUtils.dp2px(context, 900f)) + setHeight(AutoSizeUtils.dp2px(context, 970f)) (mapRoamView.layoutParams as? MarginLayoutParams)?.topMargin = 160 (clScanningBg.layoutParams as? MarginLayoutParams)?.topMargin = 160 (tvRoadRoamTitle.layoutParams as? MarginLayoutParams)?.leftMargin = 35 diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_nor_test_light.9.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_nor_test_light.9.png deleted file mode 100644 index 81acc4e8c0..0000000000 Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_nor_test_light.9.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_right_base_light.9.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_right_base_light.9.png new file mode 100644 index 0000000000..8189ddde46 Binary files /dev/null and b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_right_base_light.9.png differ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_road_cross_roam_light.9.png b/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_road_cross_roam_light.9.png deleted file mode 100644 index cbedb0b8f9..0000000000 Binary files a/core/function-impl/mogo-core-function-map/src/main/res/drawable/bg_road_cross_roam_light.9.png and /dev/null differ diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml index 7e95a141d8..2e10ae5e3d 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam_light.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bg_nor_test_light"> + android:background="@drawable/bg_right_base_light">