From 0ef4820e09de19361f8a5c0dcb60b9950ad40616 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 10 Dec 2020 13:43:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BA=8B=E4=BB=B6=E5=BC=B9=E6=A1=86=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=B7=A6=E4=BE=A7=E5=9C=86=E8=A7=92=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/V2XShareEventAdapter.java | 2 +- .../v2x/adapter/holder/V2XRoadEventVH.java | 12 ++++++-- .../mogo/module/v2x/utils/EventTypeUtils.java | 30 +++++++++++++++++++ .../res/layout/item_v2x_event_detail_vr.xml | 1 - .../res/layout/item_v2x_fault_help_vr.xml | 1 + 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 6828c691cf..665b08f9f5 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -107,7 +107,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter { private static final String TAG = "V2XRoadEventVH"; + private Context mContext; private MogoImageView ivEventImg; private MogoImageView ivReportHead; private ImageView ivEventPlay; @@ -144,6 +151,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_v2x_event_detail_vr, viewGroup, false) : LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_v2x_event_detail, viewGroup, false) ); + mContext = viewGroup.getContext(); init(itemView); // 设置视图状态监听 itemView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() { @@ -206,8 +214,8 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { imgUrl = mNoveltyInfo.getItems().get(0).getUrl(); } if (!TextUtils.isEmpty(imgUrl)) { - V2XServiceManager.getImageLoader() - .displayImage(imgUrl, ivEventImg); + Glide.with(mContext).load(imgUrl).apply(RequestOptions.bitmapTransform( + new GlideRoundedCornersTransform(20, GlideRoundedCornersTransform.CornerType.LEFT))).into(ivEventImg); } if (url.contains(".mp4")) { ivEventImg.setOnClickListener(v -> { diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java index 5df0729f44..bb1d51fefc 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java @@ -121,6 +121,36 @@ public class EventTypeUtils { return strBg; } + /* + * VR模式下道路类型影响到分享列表 (VR模式暂时没有事件面板,所以可以删除此方法,公用上边的getPoiTypeBg) + * */ + public static int getPoiTypeBgForShareItem(String poiType) { + int strBg; + switch (poiType) { + case V2XPoiTypeEnum.FOURS_PARKING: // 停车场 + case V2XPoiTypeEnum.GAS_STATION: // 加油站 + strBg = R.drawable.bg_v2x_event_type_blue; + break; + case V2XPoiTypeEnum.FOURS_BLOCK_UP: // 拥堵 + case V2XPoiTypeEnum.FOURS_LIVING: // 实时路况 + case V2XPoiTypeEnum.FOURS_NEALY: // 身边 + strBg = R.drawable.bg_v2x_event_type_orange; + break; + case V2XPoiTypeEnum.TRAFFIC_CHECK:// 交通检查 + case V2XPoiTypeEnum.ROAD_CLOSED:// 封路 + case V2XPoiTypeEnum.FOURS_ROAD_WORK:// 施工 + case V2XPoiTypeEnum.FOURS_PONDING:// 积水 + case V2XPoiTypeEnum.FOURS_FOG: // 浓雾 + case V2XPoiTypeEnum.FOURS_ICE: // 结冰 + case V2XPoiTypeEnum.FOURS_ACCIDENT: // 事故 + strBg = R.drawable.bg_v2x_event_type_read; + break; + default: + strBg = R.drawable.bg_v2x_event_type_read; + break; + } + return strBg; + } /** * 判断是否是道路预警事件 diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml index 2e753f40fc..79822a5547 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml @@ -16,7 +16,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:miv_bottomLeftRadius="@dimen/dp_20" app:miv_failureHolder="@drawable/v2x_icon_live_logo" app:miv_overlayImageId="@drawable/v2x_icon_live_logo" app:miv_placeHolder="@drawable/v2x_icon_live_logo" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml index ed01bd0d88..f11eb95ea2 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml @@ -107,6 +107,7 @@ android:layout_width="@dimen/module_v2x_event_button_size_vr" android:layout_height="@dimen/module_v2x_event_button_size_vr" android:src="@drawable/selector_nav_btn" + android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" />