diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml index 32619dccd9..5608fd00d2 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_base_fragment.xml @@ -154,7 +154,7 @@ android:layout_width="@dimen/dp_600" android:layout_height="@dimen/dp_740" android:layout_marginTop="@dimen/dp_350" - android:layout_marginRight="@dimen/dp_50" + android:layout_marginRight="@dimen/dp_45" android:visibility="gone" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> 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 fdd39dbdfb..55f42959cc 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 @@ -195,9 +195,8 @@ @@ -231,7 +230,6 @@ android:layout_width="@dimen/dp_660" android:layout_height="@dimen/dp_480" android:layout_marginTop="@dimen/dp_400" - android:layout_marginEnd="@dimen/dp_10" android:visibility="gone" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml index 3cbbd46260..0e06ddc081 100644 --- a/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml +++ b/OCH/taxi/unmanned-driver/src/main/res/layout/unmanned_taxi_base_fragment.xml @@ -211,9 +211,10 @@ @@ -232,9 +233,10 @@ 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 7e679e6262..ab48c6bf9e 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,9 +98,9 @@ @@ -119,9 +119,9 @@ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt index ebc86bfbd3..e657e6aaea 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadCrossLiveView.kt @@ -174,7 +174,7 @@ class RoadCrossLiveView @JvmOverloads constructor( * 重置视图,播放下一个 */ private fun resetView() { - CallerHmiViewControlListenerManager.invokeV2XEvent(TAG, View.VISIBLE) + CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG) this.visibility = View.VISIBLE roadCrossLivePB.visibility = View.VISIBLE roadCrossLivePlayer.onVideoReset() @@ -187,7 +187,7 @@ class RoadCrossLiveView @JvmOverloads constructor( if(visibility == View.GONE){ return } - CallerHmiViewControlListenerManager.invokeV2XEvent(TAG, View.GONE) + CallerHmiViewControlListenerManager.invokeV2XEvent(View.GONE, TAG) this.visibility = View.GONE roadCrossLivePlayer.visibility = View.GONE curLiveDevice = null diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt index 965db0320d..526225a018 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/exploration/AutomaticExplorationView.kt @@ -234,8 +234,8 @@ open class AutomaticExplorationView @JvmOverloads constructor( } - override fun v2xEventVisible(v: Int) { - super.v2xEventVisible(v) + override fun v2xEventVisible(v: Int, tag: String) { + super.v2xEventVisible(v, tag) if(v == View.VISIBLE){ //如果当前探查是出于显示状态，则取消动画，并且隐藏 if(this@AutomaticExplorationView.visibility == View.VISIBLE){ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt index 24cc1eecea..ed894c65ad 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/v2n/RoadV2NEventWindowView.kt @@ -81,7 +81,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( private val dismissRunnable = Runnable { CallerLogger.i(TAG, "dismissRunnable") visibility = View.GONE - CallerHmiViewControlListenerManager.invokeV2XEvent(TAG, View.GONE) + CallerHmiViewControlListenerManager.invokeV2XEvent(View.GONE) } private fun initView() { @@ -338,7 +338,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( visibility = View.VISIBLE bringToFront() UiThreadHandler.postDelayed(dismissRunnable, 10 * 1000L) - CallerHmiViewControlListenerManager.invokeV2XEvent(TAG, View.VISIBLE) + CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE) } } @@ -351,7 +351,7 @@ class RoadV2NEventWindowView @JvmOverloads constructor( livePlayView.stopRoadCameraLive() trackEvent("dismiss --> eventId=${eventId}, 执行dismiss") UiThreadHandler.removeCallbacks(dismissRunnable) - CallerHmiViewControlListenerManager.invokeV2XEvent(TAG, View.GONE) + CallerHmiViewControlListenerManager.invokeV2XEvent(View.GONE) } else { trackEvent("dismiss --> eventId=${eventId}, 跳过dismiss") } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt index acc3ad1cc7..965ae8eae6 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/FusionTrafficLightView.kt @@ -83,7 +83,7 @@ class FusionTrafficLightView @JvmOverloads constructor( UiThreadHandler.post{ mCurrentLightId = TrafficLightEnum.BLACK this@FusionTrafficLightView.visibility = GONE - CallerHmiViewControlListenerManager.invokeV2XEvent(TAG, View.GONE) + CallerHmiViewControlListenerManager.invokeV2XEvent(View.GONE, TAG) } } @@ -114,7 +114,7 @@ class FusionTrafficLightView @JvmOverloads constructor( //如果当前红绿灯视图为隐藏状态则设置为显示状态 if(this@FusionTrafficLightView.visibility == View.GONE){ this@FusionTrafficLightView.visibility = View.VISIBLE - CallerHmiViewControlListenerManager.invokeV2XEvent(TAG, View.VISIBLE) + CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG) AutopilotSummaryInfo.lightServicesNum++ //首次展示，需要将当前、下一、下二灯态的时间占比绘制出来，只绘制一次 val proportionList = intArrayOf(0, 0, 0) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/NoScrollLayoutManager.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/NoScrollLayoutManager.kt new file mode 100644 index 0000000000..86f2d71623 --- /dev/null +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/NoScrollLayoutManager.kt @@ -0,0 +1,15 @@ +package com.mogo.eagle.core.function.hmi.ui.widget + +import android.content.Context +import androidx.recyclerview.widget.LinearLayoutManager + + +class NoScrollLayoutManager(context: Context?) : LinearLayoutManager(context) { + override fun canScrollVertically(): Boolean { + return false + } + + override fun canScrollHorizontally(): Boolean { + return false + } +} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt index 978ad10423..c6905b9869 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/IdentifyOriginDataDrawer.kt @@ -110,7 +110,7 @@ class IdentifyOriginDataDrawer : Identify { mFilterTrafficData[uuid] = temp mMarkersCaches[uuid] = temp trafficDataUuidList.add(uuid) - TrackerSourceFilterHelper.filterZombieMarker(data) +// TrackerSourceFilterHelper.filterZombieMarker(data) } return mFilterTrafficData } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java index 66852e0d4c..1a3c93e85c 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackManager.java @@ -125,7 +125,7 @@ public class TrackManager { cellIdCaches.forcePut(uuid, trackObj.getCellIdPos()); mMarkersCaches.put(uuid, trackObj); trafficDataUuid.add(uuid); - TrackerSourceFilterHelper.INSTANCE.filterZombieMarker(data); +// TrackerSourceFilterHelper.INSTANCE.filterZombieMarker(data); } //Log.i("costTime","" + (System.currentTimeMillis() - cost)); } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt index 1e13483d46..ba8ae40d2f 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceFilterHelper.kt @@ -104,16 +104,19 @@ object TrackerSourceFilterHelper { } //僵尸车 -// if (data.addAttribute == AdditionalAttribute.ATTR_ZOMBIE) { -// color = "#7A8499FF" -// if (FunctionBuildConfig.skinMode == 1) { -// color = "#9BA8BCFF" -// } -// } + if (data.addAttribute == MessagePad.AdditionalAttribute.ATTR_ZOMBIE) { + color = "#7A8499FF" + if (FunctionBuildConfig.skinMode == 1) { + color = "#9BA8BCFF" + } + } return color } + /** + * native实现逻辑遗留问题，后续解决 + */ fun filterZombieMarker(data: TrackedObject){ if (data.addAttribute == MessagePad.AdditionalAttribute.ATTR_ZOMBIE) { if (!cacheZombieMap.contains(data.uuid.toString())) { diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java index ede65c77c9..3724222891 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/MogoRouteOverlayManager.java @@ -35,7 +35,7 @@ public class MogoRouteOverlayManager implements private final IViewControlListener listener = new IViewControlListener() { @Override - public void v2xEventVisible(int v) { + public void v2xEventVisible(int v, String tag) { } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt index bd08778a2b..78b1f418e1 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamListAdapter.kt @@ -1,6 +1,7 @@ package com.mogo.eagle.core.function.view import android.content.Context +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -21,6 +22,12 @@ class RoadCrossRoamListAdapter(private val mContext: Context, private val lightM items.add("路口危险车辆分析") items.add("路口交通事故分析") items.add("路口行人碰撞分析") + Log.i("emArrow","lightmode:$lightMode") + if(lightMode){ + items.add("路口非机动车分析") + items.add("路口灯态分析") + Log.i("emArrow","day mode add, list size : ${items.size}") + } } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { @@ -29,10 +36,12 @@ class RoadCrossRoamListAdapter(private val mContext: Context, private val lightM } override fun getItemCount(): Int { - return items.size + Log.i("emArrow","count mode: $lightMode") + return if(lightMode) 6 else 4 } override fun onBindViewHolder(holder: ViewHolder, position: Int) { + Log.i("emArrow","onBindViewHolder item size: ${items.size} , count:${itemCount}") val item = items[position] if(lightMode){ holder.textView.setTextColor(mContext.getColor(R.color.color_191A1C)) diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt index bfd6567a95..163af29810 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/view/RoadCrossRoamView.kt @@ -8,6 +8,7 @@ import android.os.Handler import android.os.Looper import android.os.Message import android.util.AttributeSet +import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.animation.LinearInterpolator @@ -17,9 +18,9 @@ import androidx.recyclerview.widget.RecyclerView import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.config.FunctionBuildConfig import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener +import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener.Companion.V2X_EVENT_TAG import com.mogo.eagle.core.function.api.map.road.IMoGoMapRoadListener import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager -import com.mogo.eagle.core.function.call.autopilot.CallerV2nNioEventListenerManager import com.mogo.eagle.core.function.call.hmi.CallerHmiViewControlListenerManager import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager import com.mogo.eagle.core.function.call.map.CallerMapRoadListenerManager @@ -35,8 +36,11 @@ import kotlinx.android.synthetic.main.view_road_cross_roam.view.ivCoverRoam import kotlinx.android.synthetic.main.view_road_cross_roam.view.ivRoadRoamClose import kotlinx.android.synthetic.main.view_road_cross_roam.view.lvRoadCrossRoamTip import kotlinx.android.synthetic.main.view_road_cross_roam.view.mapRoamView +import kotlinx.android.synthetic.main.view_road_cross_roam_light.view.clScanningBg +import kotlinx.android.synthetic.main.view_road_cross_roam_light.view.ivZhiRoadRoamSet import kotlinx.android.synthetic.main.view_road_cross_roam_light.view.ivZhiRoadRoamView import kotlinx.android.synthetic.main.view_road_cross_roam_light.view.tvRoadRoamTitle +import me.jessyan.autosize.utils.AutoSizeUtils import kotlin.properties.Delegates @@ -61,6 +65,7 @@ class RoadCrossRoamView @JvmOverloads constructor( private var animator: ObjectAnimator? = null private var rotationAnim: ObjectAnimator? = null private var lightMode = CallerSkinModeListenerManager.getMode() == 1 + private var animScale = false private val handler = object : Handler(Looper.getMainLooper()) { override fun handleMessage(msg: Message) { @@ -78,7 +83,7 @@ class RoadCrossRoamView @JvmOverloads constructor( R.layout.view_road_cross_roam } LayoutInflater.from(context).inflate(res, this, true) - lvRoadCrossRoamTip.layoutManager = LinearLayoutManager(context) + lvRoadCrossRoamTip.layoutManager = NoScrollLayoutManager(context) lvRoadCrossRoamTip.addItemDecoration(object : RecyclerView.ItemDecoration() { override fun getItemOffsets( outRect: Rect, @@ -102,6 +107,51 @@ class RoadCrossRoamView @JvmOverloads constructor( } } + override fun v2xEventVisible(v: Int, tag: String) { + super.v2xEventVisible(v, tag) + if (this.visibility == View.GONE) { + return + } + if (animScale) { + return + } + if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { + if (tag == V2X_EVENT_TAG && v == View.VISIBLE) { + val anim = ValueAnimator.ofInt(height, 475) + anim.duration = 500 + anim.addUpdateListener { animation -> + val value = animation.animatedValue as Int + setHeight(value) + } + anim.start() + + val animMap = ValueAnimator.ofInt(160, 80) + animMap.duration = 500 + animMap.addUpdateListener { animation -> + val value = animation.animatedValue as Int + (mapRoamView.layoutParams as? MarginLayoutParams)?.topMargin = value + (clScanningBg.layoutParams as? MarginLayoutParams)?.topMargin = value + } + animMap.start() + + lvRoadCrossRoamTip.visibility = View.GONE + ivZhiRoadRoamSet.visibility = View.GONE + ivZhiRoadRoamView.visibility = View.GONE + tvRoadRoamTitle.setTextSize( + TypedValue.COMPLEX_UNIT_PX, + AutoSizeUtils.dp2px(context, 30f).toFloat() + ) + tvRoadRoamTitle.text = "为您全面扫描潜在风险" + animScale = true + } + } + } + + private fun setHeight(height: Int) { + layoutParams.height = height + requestLayout() + } + override fun onAttachedToWindow() { super.onAttachedToWindow() CallerMapRoadListenerManager.addListener(TAG, this) @@ -130,7 +180,7 @@ class RoadCrossRoamView @JvmOverloads constructor( private fun attachView() { // 没有路线不做提示 - if(CallerAutoPilotStatusListenerManager.getLineId() == 0L){ + if (CallerAutoPilotStatusListenerManager.getLineId() == 0L) { return } // 处于漫游模式下不做处理 @@ -141,11 +191,11 @@ class RoadCrossRoamView @JvmOverloads constructor( return } // 首页被遮挡不做提示 - if(!CallerHmiViewControlListenerManager.getMainPageVisible()){ + if (!CallerHmiViewControlListenerManager.getMainPageVisible()) { CallerLogger.d("$M_MAP$TAG", "attachView return , mainPageVisible is false") return } - CallerHmiViewControlListenerManager.invokeV2XEvent(TAG, View.VISIBLE) + CallerHmiViewControlListenerManager.invokeV2XEvent(View.VISIBLE, TAG) bringToFront() CallerMapIdentifyManager.roam = Pair(TAG, true) this.visibility = View.VISIBLE @@ -194,7 +244,7 @@ class RoadCrossRoamView @JvmOverloads constructor( if (this.visibility == View.GONE) { return } - if(handler.hasMessages(MSG_HIDE_VIEW)){ + if (handler.hasMessages(MSG_HIDE_VIEW)) { handler.removeMessages(MSG_HIDE_VIEW) } mapRoamView.closeRoam() @@ -205,7 +255,22 @@ class RoadCrossRoamView @JvmOverloads constructor( if (lightMode) { ivZhiRoadRoamView.clearAnimation() } - CallerHmiViewControlListenerManager.invokeV2XEvent(TAG, View.GONE) + + if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode) && animScale) { + setHeight(AutoSizeUtils.dp2px(context, 945f)) + (mapRoamView.layoutParams as? MarginLayoutParams)?.topMargin = 160 + (clScanningBg.layoutParams as? MarginLayoutParams)?.topMargin = 160 + lvRoadCrossRoamTip.visibility = View.VISIBLE + ivZhiRoadRoamSet.visibility = View.VISIBLE + tvRoadRoamTitle.setTextSize( + TypedValue.COMPLEX_UNIT_PX, + AutoSizeUtils.dp2px(context, 24f).toFloat() + ) + ivZhiRoadRoamView.visibility = View.VISIBLE + tvRoadRoamTitle.text = context.resources.getString(R.string.road_cross_roam_tip) + animScale = false + } + CallerHmiViewControlListenerManager.invokeV2XEvent(View.GONE, TAG) this.visibility = View.GONE } @@ -219,4 +284,13 @@ class RoadCrossRoamView @JvmOverloads constructor( CallerHmiViewControlListenerManager.removeListener(TAG) } + private class NoScrollLayoutManager(context: Context?) : LinearLayoutManager(context) { + override fun canScrollVertically(): Boolean { + return false + } + + override fun canScrollHorizontally(): Boolean { + return false + } + } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml index ea672c1bd6..c4a5ab6d02 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/item_road_cross_roam_tip.xml @@ -3,22 +3,22 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/dp_30"> + android:layout_height="@dimen/dp_36"> diff --git a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam.xml b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam.xml index 51bd7902bb..1d73bdacd5 100644 --- a/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam.xml +++ b/core/function-impl/mogo-core-function-map/src/main/res/layout/view_road_cross_roam.xml @@ -49,6 +49,7 @@ app:layout_constraintTop_toTopOf="parent" /> @@ -64,6 +65,7 @@ app:styleMode="MAP_STYLE_DAY_VR_TAXI" /> () M_LISTENERS[tag]?.visible(v) } - fun invokeV2XEvent(tag: String, v: Int) { + fun invokeV2XEvent(v: Int, tag: String = IViewControlListener.V2X_EVENT_TAG) { v2xEventTag[tag] = v M_LISTENERS.forEach { val listener = it.value - listener.v2xEventVisible(v) + listener.v2xEventVisible(v, tag) } }