diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java index 3a84438115..d13325056c 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XShareEventAdapter.java @@ -48,6 +48,7 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter public void triggerReportErr(MarkerExploreWay noveltyInfo) { try { RoadConditionUtils.sendShareReceiverInfo( - noveltyInfo.getPoiType(), noveltyInfo.getInfoId(), + noveltyInfo.getPoiType(), 3); TrackUtils.trackV2xRoadEvent( @@ -121,8 +121,8 @@ public abstract class V2XBaseViewHolder public void triggerReportTrue(MarkerExploreWay noveltyInfo) { try { RoadConditionUtils.sendShareReceiverInfo( - noveltyInfo.getPoiType(), noveltyInfo.getInfoId(), + noveltyInfo.getPoiType(), 2); TrackUtils.trackV2xRoadEvent( 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 806981ef15..b57ff5d648 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 @@ -118,8 +118,8 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder { private void roadReportTrue() { if (mExploreWay != null) { RoadConditionUtils.sendShareReceiverInfo( - mExploreWay.getPoiType(), mExploreWay.getInfoId(), + mExploreWay.getPoiType(), 2); } delayedCloseWindow(); @@ -131,8 +131,8 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder { private void roadReportErr() { if (mExploreWay != null) { RoadConditionUtils.sendShareReceiverInfo( - mExploreWay.getPoiType(), mExploreWay.getInfoId(), + mExploreWay.getPoiType(), 3); } delayedCloseWindow(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java index e5c6e39974..03d346838b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java @@ -112,8 +112,8 @@ public class V2XScenarioHistoryIllegalParkVH extends V2XBaseViewHolder{ - public ShareEventsPresenter(IView view) { - super((V2XShareEventsFragment) view); + + public ShareEventsPresenter(IView view) { super((V2XShareEventsFragment) view); } + + public void loadShareEventList() { + WorkThreadHandler.getInstance().post(() -> { + mView.getShareEventResponse(); + }); } + } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java index aee983ba03..9a3ad242f3 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingScenario.java @@ -65,7 +65,7 @@ public class V2XFatigueDrivingScenario extends AbsV2XScenario i @Override public void onViewRemoved(View view) { Logger.d(MODULE_NAME, "关闭 Window 动画结束"); - V2XServiceManager.getMoGoV2XStatusManager().setPushWindowShow(TAG, false); } @Override @@ -142,6 +141,7 @@ public class V2XPushEventScenario extends AbsV2XScenario i @Override public void beforeViewRemoveAnim(View view) { Logger.d(MODULE_NAME, "关闭 Window 开始"); + V2XServiceManager.getMoGoV2XStatusManager().setPushWindowShow(TAG, false); // 重置场景提示的消息 setV2XMessageEntity(null); clearPOI(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java index a2d89e3cba..f2565bbf67 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventScenario.java @@ -211,7 +211,6 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp @Override public void onViewRemoved(View view) { Logger.d(MODULE_NAME, "关闭 Window 动画结束"); - V2XServiceManager.getMoGoV2XStatusManager().setRoadEventWindowShow(TAG, false); } @Override @@ -222,6 +221,7 @@ public class V2XRoadEventScenario extends AbsV2XScenario imp @Override public void beforeViewRemoveAnim(View view) { Logger.d(MODULE_NAME, "关闭 Window 开始"); + V2XServiceManager.getMoGoV2XStatusManager().setRoadEventWindowShow(TAG, false); // 重置场景提示的消息 setV2XMessageEntity(null); clearPOI(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java index 79bcc6420b..10da5513fe 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/seek/V2XSeekHelpScenario.java @@ -160,7 +160,6 @@ public class V2XSeekHelpScenario extends AbsV2XScenario> i @Override public void onViewRemoved(View view) { Logger.d(MODULE_NAME, "关闭 Window 动画结束"); - V2XServiceManager.getMoGoV2XStatusManager().setOtherSeekHelpWindowShow(TAG, false); } @Override @@ -171,6 +170,7 @@ public class V2XSeekHelpScenario extends AbsV2XScenario> i @Override public void beforeViewRemoveAnim(View view) { Logger.d(MODULE_NAME, "关闭 Window 开始"); + V2XServiceManager.getMoGoV2XStatusManager().setOtherSeekHelpWindowShow(TAG, false); // 重置场景提示的消息 setV2XMessageEntity(null); clearPOI(); diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png index 132ee06da9..48218a14a8 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_choose.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png index 0eb58cb3e0..1f42366be2 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_second.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png index c3aaede08e..932cb60d44 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/icon_enthusiasm_unchoose.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml index e36175ddc9..10fe9e7433 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml @@ -7,4 +7,5 @@ android:endColor="#3F4057" android:type="linear" android:angle="180"/> + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml index 7656a1a428..d45ca08f1b 100644 --- a/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml +++ b/modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_refresh.xml @@ -1,7 +1,7 @@ - + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml index 2a28732b3a..58553bf763 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml @@ -84,7 +84,7 @@ android:layout_marginTop="@dimen/module_v2x_surrounding_empty_tv_margin_top" android:gravity="center_horizontal" android:text="周边5公里,暂无交通事件" - android:textColor="@color/white" + android:textColor="@color/transparent_white_30" android:textSize="@dimen/module_v2x_surrounding_top_textsize" android:textStyle="bold" /> @@ -97,7 +97,7 @@ android:layout_marginTop="1px" android:gravity="center_horizontal" android:text="你可以试着分享一个事件给其他车主" - android:textColor="@color/white" + android:textColor="@color/transparent_white_30" android:textSize="@dimen/module_v2x_surrounding_top_textsize" android:textStyle="bold" /> diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml index 17d32282fe..cd11ceacab 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml @@ -91,4 +91,10 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/rgTabSelect" /> + + diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml index cfe8dcfd4b..e9d00092d3 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml @@ -60,7 +60,7 @@ android:layout_width="0.5px" android:layout_height="46px" android:layout_marginTop="20px" - android:alpha="0.5" + android:alpha="0.3" android:background="#FFFFFF" /> + android:layout_marginTop="20px">