diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java index 7d4f0885d8..f5fbe75e3a 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XConst.java @@ -1,5 +1,7 @@ package com.mogo.module.v2x; +import com.mogo.module.common.MogoApisHandler; + /** * author : donghongyu * e-mail : 1358506549@qq.com @@ -131,4 +133,9 @@ public class V2XConst { * 绿波车速marker */ public static final String V2X_OPTIMAL_SPEED_MARKER = "V2X_OPTIMAL_SPEED_MARKER"; + + /* + * VR模式 + * */ + public static final boolean VR_MODE = MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index 97fa75bc3a..fbc74ab555 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -9,6 +9,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.mogo.commons.debug.DebugConfig; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.MarkerUserInfo; @@ -31,6 +32,7 @@ import java.util.Locale; import static android.view.View.GONE; import static android.view.View.VISIBLE; +import static com.mogo.module.v2x.V2XConst.VR_MODE; /** * e-mail : 1358506549@qq.com @@ -194,7 +196,9 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { .append("" + (int) mV2XPushMessageEntity.getDistance()) .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) .append("米") - .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) + .setFontSize((int) itemView.getResources().getDimension( + VR_MODE ? + R.dimen.module_v2x_event_distance_title_vr : R.dimen.module_v2x_event_distance_title)) .create(); } SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA); 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 c7c9ab1283..0849420071 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 @@ -45,6 +45,7 @@ import java.util.List; import static android.view.View.GONE; import static android.view.View.VISIBLE; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; +import static com.mogo.module.v2x.V2XConst.VR_MODE; /** * author : donghongyu @@ -139,7 +140,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { } public V2XRoadEventVH(ViewGroup viewGroup) { - super(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ? + super(VR_MODE ? 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) ); 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 075cb10361..566a7e4802 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 @@ -36,6 +36,7 @@ import java.util.List; import static com.mogo.module.common.entity.MarkerPoiTypeEnum.FOURS_BLOCK_UP; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; +import static com.mogo.module.v2x.V2XConst.VR_MODE; /** * author : donghongyu @@ -104,7 +105,7 @@ public class V2XRoadEventWindow extends RelativeLayout private void initView(Context context) { //Logger.d(MODULE_NAME, "V2X===初始化道路事件小窗口View。。。。。"); // 填充布局 - LayoutInflater.from(context).inflate(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode() ? + LayoutInflater.from(context).inflate(VR_MODE ? 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/java/com/mogo/module/v2x/utils/EventTypeUtils.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/utils/EventTypeUtils.java index 16c8cdd890..5df0729f44 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 @@ -7,6 +7,8 @@ import com.mogo.module.v2x.R; import com.mogo.module.v2x.voice.V2XVoiceConstants; import com.mogo.utils.logger.Logger; +import static com.mogo.module.v2x.V2XConst.VR_MODE; + /** * @ProjectName: MoGoModulSafeDriving * @Package: com.mogo.module.v2x.utils @@ -101,7 +103,7 @@ public class EventTypeUtils { case V2XPoiTypeEnum.FOURS_BLOCK_UP: // 拥堵 case V2XPoiTypeEnum.FOURS_LIVING: // 实时路况 case V2XPoiTypeEnum.FOURS_NEALY: // 身边 - strBg = R.drawable.bg_v2x_event_type_orange; + strBg = VR_MODE ? R.drawable.bg_v2x_event_type_orange_vr : R.drawable.bg_v2x_event_type_orange; break; case V2XPoiTypeEnum.TRAFFIC_CHECK:// 交通检查 case V2XPoiTypeEnum.ROAD_CLOSED:// 封路 @@ -110,10 +112,10 @@ public class EventTypeUtils { case V2XPoiTypeEnum.FOURS_FOG: // 浓雾 case V2XPoiTypeEnum.FOURS_ICE: // 结冰 case V2XPoiTypeEnum.FOURS_ACCIDENT: // 事故 - strBg = R.drawable.bg_v2x_event_type_read; + strBg = VR_MODE ? R.drawable.bg_v2x_event_type_red_vr : R.drawable.bg_v2x_event_type_read; break; default: - strBg = R.drawable.bg_v2x_event_type_read; + strBg = VR_MODE ? R.drawable.bg_v2x_event_type_red_vr : R.drawable.bg_v2x_event_type_read; break; } return strBg; diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java index cb659d2f97..dc9e155ed7 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java @@ -14,6 +14,8 @@ import androidx.annotation.Nullable; import com.mogo.module.v2x.R; +import static com.mogo.module.v2x.V2XConst.VR_MODE; + /** * 红心点赞按钮控件 * @@ -44,7 +46,7 @@ public class HeartLikeView extends LinearLayout implements Animator.AnimatorList inflate(context, R.layout.view_heart_like_gray_back, this); mIllegalParkingLike = findViewById(R.id.ivLikeForGrayBack); } else { - inflate(context, R.layout.view_heart_like, this); + inflate(context, VR_MODE ? R.layout.view_heart_like_vr : R.layout.view_heart_like, this); mIllegalParkingLike = findViewById(R.id.ivIllegalParkingLike); } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_vr.png new file mode 100644 index 0000000000..c74d1b9fe8 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/icon_heart_like_vr.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_live_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_live_vr.png new file mode 100644 index 0000000000..eb18411f9f Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_live_vr.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/selector_live_btn_vr.xml b/modules/mogo-module-v2x/src/main/res/drawable/selector_live_btn_vr.xml new file mode 100644 index 0000000000..669fac1b71 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/selector_live_btn_vr.xml @@ -0,0 +1,6 @@ + + + + + + \ 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 ff21c0fab0..2e753f40fc 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 @@ -13,24 +13,26 @@ android:layout_width="@dimen/dp_120" android:layout_height="@dimen/dp_120" android:scaleType="fitXY" - android:src="@drawable/mogo_image_daolushigong_nor" 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" /> + app:miv_placeHolder="@drawable/v2x_icon_live_logo" + app:miv_topLeftRadius="@dimen/dp_20" /> + app:layout_constraintBottom_toBottomOf="@id/ivEventImg" + app:layout_constraintEnd_toEndOf="@id/ivEventImg" + app:layout_constraintStart_toStartOf="@id/ivEventImg" + app:layout_constraintTop_toTopOf="@id/ivEventImg" /> + + + + \ No newline at end of file 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 e55d923cc8..0d32354e6d 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 @@ -89,8 +89,9 @@ 130px - 64px + 80px 120px + 64px 330px @@ -112,6 +113,8 @@ 940px 701px + 32px + 830px 664px