diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index e6cb9bdf1c..e76a035b56 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -200,6 +200,13 @@ public class EntranceFragment extends MvpFragment 40 ? "#DB3137" : "#3E77F6")); mouduleArc.setValues(speed); + flSpeed.setBackgroundResource(speed > 40 ? R.drawable.yi_biao_pan_bg_speeding : R.drawable.yi_biao_pan_bg_nor); } @Override diff --git a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/yi_biao_pan_bg_nor.png b/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/yi_biao_pan_bg_nor.png deleted file mode 100644 index f6233c8849..0000000000 Binary files a/modules/mogo-module-extensions/src/main/res/drawable-xhdpi/yi_biao_pan_bg_nor.png and /dev/null differ diff --git a/modules/mogo-module-extensions/src/main/res/drawable/green_light_vr_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/green_light_vr_bg.xml new file mode 100644 index 0000000000..053ca17b45 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/green_light_vr_bg.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/red_light_vr_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/red_light_vr_bg.xml new file mode 100644 index 0000000000..c8b510cfd4 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/red_light_vr_bg.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/traffic_light_vr_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/traffic_light_vr_bg.xml new file mode 100644 index 0000000000..90c7bde175 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/traffic_light_vr_bg.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/view_traffic_light_vr_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/view_traffic_light_vr_bg.xml new file mode 100644 index 0000000000..a63c02e5a6 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/view_traffic_light_vr_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/yellow_light_vr_bg.xml b/modules/mogo-module-extensions/src/main/res/drawable/yellow_light_vr_bg.xml new file mode 100644 index 0000000000..9248409de9 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/yellow_light_vr_bg.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_nor.xml b/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_nor.xml new file mode 100644 index 0000000000..077f8a578a --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_nor.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_speeding.xml b/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_speeding.xml new file mode 100644 index 0000000000..9a939a7647 --- /dev/null +++ b/modules/mogo-module-extensions/src/main/res/drawable/yi_biao_pan_bg_speeding.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index 91e39cd779..cddd191134 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -5,7 +5,10 @@ android:id="@+id/module_entrance_id_top_motion_layout" android:layout_width="match_parent" android:layout_height="match_parent"> - + @@ -40,6 +47,52 @@ android:layout_gravity="center" /> + + + + + + + + + { } }; + private MogoImageView ivEvent; + private TextView tvEvent; + private TextView tvPlay; + + private void init(View itemView) { ivEventImg = itemView.findViewById(R.id.ivEventImg); ivReportHead = itemView.findViewById(R.id.ivEventHead); @@ -150,6 +155,10 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { ivEventZan = itemView.findViewById(R.id.ivEventZan); ivEventReportTrue = itemView.findViewById(R.id.ivEventReportTrue); ivEventReportErr = itemView.findViewById(R.id.ivEventReportErr); + + ivEvent = itemView.findViewById(R.id.iv_event); + tvEvent = itemView.findViewById(R.id.tv_event); + tvPlay = itemView.findViewById(R.id.tv_play); } public V2XRoadEventVH(ViewGroup viewGroup, IV2XWindow v2XWindow) { @@ -233,6 +242,9 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { ivEventImg.setOnClickListener(v -> { showRoadVideoInfo(v2XEventShowEntity); }); + tvPlay.setOnClickListener(v -> { + showRoadVideoInfo(v2XEventShowEntity); + }); ivEventPlay.setOnClickListener(v -> { showRoadVideoInfo(v2XEventShowEntity); }); @@ -253,7 +265,10 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { if (!TextUtils.isEmpty(poiType)) { tvEventTypeTitle.setText(poiType); tvEventTypeTitle.setBackgroundResource(EventTypeUtils.getPoiTypeBg(mNoveltyInfo.getPoiType())); + } + ivEvent.setImageResource(EventTypeUtils.getPoiTypeSrcVr(mNoveltyInfo.getPoiType())); + tvEvent.setText(EventTypeUtils.getPoiTypeStrVr(mNoveltyInfo.getPoiType())); tvEventAddress.setText(mNoveltyInfo.getAddr()); tvEventDistance.setText("距离 " + (int) mNoveltyInfo.getDistance() + "米"); 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 36b9cc4ef3..d545155bde 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 @@ -87,6 +87,51 @@ public class EventTypeUtils { return str; } + public static int getPoiTypeSrcVr(String poiType) { + int src; + switch (poiType) { + + // 拥堵 + case V2XPoiTypeEnum.FOURS_BLOCK_UP: + src = R.drawable.v2x_icon_yongdu_vr; + break; + // 积水 + case V2XPoiTypeEnum.FOURS_PONDING: + src = R.drawable.v2x_icon_jishui_vr; + break; + // 浓雾 + case V2XPoiTypeEnum.FOURS_FOG: + src = R.drawable.v2x_icon_nongwu_vr; + break; + default: + src = R.drawable.v2x_icon_live_logo; + break; + } + return src; + } + + public static String getPoiTypeStrVr(String poiType) { + String str = "其它道路事件"; + switch (poiType) { + // 拥堵 + case V2XPoiTypeEnum.FOURS_BLOCK_UP: + str = "前方拥堵"; + break; + // 积水 + case V2XPoiTypeEnum.FOURS_PONDING: + str = "前方道路积水道路积水"; + break; + // 浓雾 + case V2XPoiTypeEnum.FOURS_FOG: + str = "浓雾预警"; + break; + default: + str = "其它道路事件"; + break; + } + return str; + } + /** * 获取道路事件的背景色 * diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png new file mode 100644 index 0000000000..da68268420 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_jishui_vr.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png new file mode 100644 index 0000000000..8dbf1d8c57 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_nongwu_vr.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png new file mode 100644 index 0000000000..e530db6a3d Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_yongdu_vr.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml new file mode 100644 index 0000000000..82d3c3395f --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml index 04481967b1..0c99dfb607 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_type_orange_vr.xml @@ -4,6 +4,6 @@ android:angle="180" android:endColor="#C57406" android:startColor="#FCB932" /> - + \ 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 2422b732d9..b8f9cd976a 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 @@ -1,214 +1,278 @@ - + android:layout_height="wrap_content" + android:gravity="center"> - - - - - + - - - - - - - - - + + + + + + + + + + + + + app:miv_borderColor="#4cffffff" + app:miv_failureHolder="@drawable/icon_default_user_head" + app:miv_overlayImageId="@drawable/icon_default_user_head" + app:miv_placeHolder="@drawable/icon_default_user_head" + app:miv_shape="circle" + app:miv_shapeBorderWidth="@dimen/dp_4" /> - + + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:layout_marginLeft="@dimen/dp_30" + app:miv_failureHolder="@drawable/v2x_icon_live_logo" + app:miv_overlayImageId="@drawable/v2x_icon_live_logo" + app:miv_placeHolder="@drawable/v2x_icon_live_logo" + app:miv_topLeftRadius="@dimen/dp_20" /> - - - + android:maxWidth="@dimen/dp_480" + android:paddingLeft="@dimen/dp_40" + android:paddingRight="@dimen/dp_40" + android:textColor="@color/v2x_white" + android:textSize="@dimen/dp_32" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toEndOf="@+id/iv_event" + app:layout_constraintTop_toTopOf="parent" /> - + - - - - - - - \ No newline at end of file + android:layout_height="@dimen/dp_140" + android:gravity="center" + android:paddingLeft="@dimen/dp_40" + android:paddingRight="@dimen/dp_40" + android:text="播放" + android:textColor="@color/v2x_event_play_text" + android:textSize="@dimen/dp_30" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + \ No newline at end of file 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 8f3f4abc39..76ddb7d31a 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 @@ -2,29 +2,23 @@ diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml index d6b4a75755..d705650afe 100644 --- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml @@ -76,7 +76,7 @@ 6px - 13px + 10px 20px 16px 31px diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml index a211bb52c0..a580148415 100644 --- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml @@ -76,7 +76,7 @@ 3px - 13px + 10px 20px 16px 31px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index b409158f76..091c72520e 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -57,7 +57,7 @@ 158px - 24px + 20px 36px 28px 55px 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 c7a3b52117..72faf8b470 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 @@ -76,7 +76,7 @@ - 24px + 16px 36px 28px 55px diff --git a/modules/mogo-module-v2x/src/main/res/values/colors.xml b/modules/mogo-module-v2x/src/main/res/values/colors.xml index d1db9ba5cf..90a1cc599d 100644 --- a/modules/mogo-module-v2x/src/main/res/values/colors.xml +++ b/modules/mogo-module-v2x/src/main/res/values/colors.xml @@ -17,5 +17,6 @@ #000000 #FFF #4DFFFFFF + #4C83FF \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index b5010d51ee..0a94e3dc59 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -72,7 +72,7 @@ 52px - 13px + 8px 20px 16px 31px