diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java index ab27796c44..b97e836e9b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java @@ -24,6 +24,7 @@ import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; +import static com.mogo.module.v2x.V2XConst.VR_MODE; /** * e-mail : 1358506549@qq.com @@ -47,7 +48,7 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder { public V2XIllegalParkVH(ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) - .inflate(R.layout.item_v2x_illegal_parking, viewGroup, false)); + .inflate(VR_MODE ? R.layout.item_v2x_illegal_parking_vr : R.layout.item_v2x_illegal_parking, viewGroup, false)); mAddressTv = itemView.findViewById(R.id.tvAddress); mIllegalNumTv = itemView.findViewById(R.id.tvIllegalNum); @@ -105,7 +106,7 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder { */ @Override public void delayedCloseWindow() { - V2XHistoryScenarioData v2XHistoryScenarioData =new V2XHistoryScenarioData(); + V2XHistoryScenarioData v2XHistoryScenarioData = new V2XHistoryScenarioData(); v2XHistoryScenarioData.setScenarioType(V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING); v2XHistoryScenarioData.setEventJsonData(GsonUtil.jsonFromObject(mExploreWay)); v2XHistoryScenarioData.setEventJsonDataHashCode(mExploreWay.hashCode()); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java index de8765c1d4..6a4e6f841c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java @@ -13,6 +13,8 @@ import androidx.annotation.Nullable; import com.mogo.module.v2x.R; +import static com.mogo.module.v2x.V2XConst.VR_MODE; + /** * 不喜欢按钮控件 * @@ -35,7 +37,7 @@ public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorLi public HeartUnLikeView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - inflate(context, R.layout.view_heart_unlike, this); + inflate(context, VR_MODE ? R.layout.view_heart_unlike_vr : R.layout.view_heart_unlike, this); mIllegalParkingUnLike = findViewById(R.id.ivIllegalParkingUnLike); setOnClickListener(v -> { diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_no_parking_like.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_no_parking_like.png new file mode 100644 index 0000000000..66173b2e02 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_no_parking_like.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_no_parking_unlike.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_no_parking_unlike.png new file mode 100644 index 0000000000..ada6ebb074 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_event_icon_no_parking_unlike.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_red_two_round_vr.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_red_two_round_vr.xml new file mode 100644 index 0000000000..9181fc498d --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_red_two_round_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_illegal_parking_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml index 4079e7009c..837cf017c1 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml @@ -4,21 +4,28 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/rlContent" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="@dimen/dp_120" android:background="@drawable/v2x_bg_pop_up" - android:paddingStart="@dimen/dp_62" - android:paddingTop="@dimen/dp_42" - android:paddingEnd="@dimen/dp_62" - android:paddingBottom="@dimen/dp_42"> + android:paddingEnd="@dimen/dp_62"> + + + app:layout_constraintBottom_toBottomOf="@+id/leftImageView" + app:layout_constraintStart_toStartOf="@+id/leftImageView" + app:layout_constraintTop_toTopOf="@+id/leftImageView" + app:layout_constraintEnd_toEndOf="@+id/leftImageView"/> + app:layout_constraintStart_toEndOf="@+id/leftImageView" + app:layout_constraintTop_toTopOf="parent" /> + android:src="@drawable/v2x_event_icon_no_parking_like" /> \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike_vr.xml new file mode 100644 index 0000000000..ebbdd0b852 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike_vr.xml @@ -0,0 +1,14 @@ + + + + + + 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 0d32354e6d..177dd99d41 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 @@ -9,10 +9,7 @@ 410px 670px - 147px - - 60px 40px @@ -92,6 +89,7 @@ 80px 120px 64px + 60px 330px @@ -112,7 +110,6 @@ 940px 940px 701px - 32px