From 068d74cd1bd7651a0e5a3427d1f0978939a23b52 Mon Sep 17 00:00:00 2001 From: liujing Date: Wed, 9 Dec 2020 11:49:32 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E4=BA=8B=E4=BB=B6=E5=BC=B9=E6=A1=86UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2x/adapter/holder/V2XRoadEventVH.java | 4 +- .../scene/road/V2XRoadEventWindow.java | 4 +- .../res/drawable/bg_v2x_event_type_red_vr.xml | 8 ++ .../res/layout/item_v2x_event_detail_vr.xml | 135 +++++++++--------- .../layout/window_road_event_detail_vr.xml | 34 +++++ .../src/main/res/values-xhdpi/dimens.xml | 4 + 6 files changed, 118 insertions(+), 71 deletions(-) create mode 100644 modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_red_vr.xml create mode 100644 modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index 667ffad0fb..c7c9ab1283 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -140,8 +140,8 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { public V2XRoadEventVH(ViewGroup viewGroup) { super(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ? - LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_v2x_event_detail, viewGroup, false) : - 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_vr, viewGroup, false) : + LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_v2x_event_detail, viewGroup, false) ); init(itemView); // 设置视图状态监听 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java index e0c344ca6a..075cb10361 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventWindow.java @@ -13,6 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.PagerSnapHelper; import androidx.recyclerview.widget.RecyclerView; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XServiceManager; @@ -103,7 +104,8 @@ public class V2XRoadEventWindow extends RelativeLayout private void initView(Context context) { //Logger.d(MODULE_NAME, "V2X===初始化道路事件小窗口View。。。。。"); // 填充布局 - LayoutInflater.from(context).inflate(R.layout.window_road_event_detail, this); + LayoutInflater.from(context).inflate(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ? + R.layout.window_road_event_detail_vr : R.layout.window_road_event_detail, this); // 详情列表 mBtnCloseWindow = findViewById(R.id.btnCloseWindow); // 详情列表 diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_red_vr.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_red_vr.xml new file mode 100644 index 0000000000..ead9ee25ff --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_red_vr.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file 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 d65db3748c..ff21c0fab0 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 @@ -3,70 +3,52 @@ 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_150" - android:background="@drawable/v2x_alert_window_bg" - app:roundLayoutRadius="@dimen/dp_30"> + android:layout_height="@dimen/dp_120" + android:background="@drawable/v2x_bg_pop_up" + android:clipChildren="true" + app:roundLayoutRadius="@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" /> + + android:id="@+id/tvEventTypeTitle" + android:layout_width="@dimen/dp_120" + android:layout_height="@dimen/dp_40" + android:layout_alignBottom="@+id/ivEventImg" + android:background="@drawable/bg_v2x_event_type_red_vr" + android:gravity="center" + android:paddingLeft="@dimen/dp_10" + android:paddingTop="@dimen/dp_3" + android:paddingRight="@dimen/dp_10" + android:paddingBottom="@dimen/dp_3" + android:textColor="#fff" + android:textSize="@dimen/module_v2x_event_type_title_text_size" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + tools:text="道路施工" /> + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml new file mode 100644 index 0000000000..855714528d --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index 8f287310b4..e55d923cc8 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -88,6 +88,10 @@ 98px 130px + + 64px + 120px + 330px 450px