diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java index 87093e57b9..53f5250437 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XHistoryScenarioData.java @@ -1,5 +1,6 @@ package com.mogo.module.common.entity; +import com.mogo.map.location.MogoLocation; import com.mogo.utils.sqlite.annotation.DbDatabase; import com.mogo.utils.sqlite.annotation.DbField; import com.mogo.utils.sqlite.annotation.DbTable; @@ -68,4 +69,14 @@ public class V2XHistoryScenarioData { public void setDispose(Boolean dispose) { isDispose = dispose; } + + @Override + public V2XHistoryScenarioData clone() throws CloneNotSupportedException { + try { + return (V2XHistoryScenarioData) super.clone(); + } catch (CloneNotSupportedException e) { + e.printStackTrace(); + } + return this; + } } 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 4ae6aa6541..bb79de34e4 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 @@ -59,7 +59,7 @@ public class V2XConst { */ public static final String V2X_ROAD_SHOW = "v2x_road_show"; public static final String V2X_ROAD_EVET = "v2x_road_event"; - public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button"; + public static final String V2X_ROAD_EVET_HISTORY_BUTTON = "V2X_button_click"; /** * V2X 道路事件操作类型 */ 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 22ee1d2379..806981ef15 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 @@ -7,17 +7,21 @@ import android.widget.TextView; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XEventShowEntity; +import com.mogo.module.common.entity.V2XHistoryScenarioData; +import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkScenario; import com.mogo.module.v2x.utils.RoadConditionUtils; +import com.mogo.module.v2x.utils.V2XSQLiteUtils; import com.mogo.module.v2x.view.HeartLikeView; import com.mogo.module.v2x.view.HeartUnLikeView; import com.mogo.module.v2x.voice.V2XVoiceCallbackListener; import com.mogo.module.v2x.voice.V2XVoiceConstants; import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.utils.GsonUtil; import static com.mogo.module.v2x.V2XConst.MODULE_NAME; @@ -101,6 +105,10 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder { */ @Override public void delayedCloseWindow() { + V2XHistoryScenarioData v2XHistoryScenarioData =new V2XHistoryScenarioData(); + v2XHistoryScenarioData.setScenarioType(V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING); + v2XHistoryScenarioData.setEventJsonData(GsonUtil.jsonFromObject(mExploreWay)); + V2XSQLiteUtils.updateScenarioHistoryDataIsDispose(v2XHistoryScenarioData); itemView.postDelayed(() -> V2XIllegalParkScenario.getInstance().close(), 1000); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java index 1f42c55f26..e729e747b3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java @@ -73,12 +73,6 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder + app:layout_constraintTop_toTopOf="@+id/tagEventType" + tools:visibility="visible" />