From 909266cf3ff0558b868643712b9a996f396eba71 Mon Sep 17 00:00:00 2001 From: liujing Date: Thu, 5 Nov 2020 17:31:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=83=AD=E5=BF=83=E6=8C=87=E6=95=B0TTS?= =?UTF-8?q?=E6=92=AD=E6=8A=A5=20-=E6=89=8B=E5=8A=A8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=B8=8D=E6=92=AD=E6=8A=A5,+=E9=80=89=E5=88=99=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=8B=E8=BF=9B=E8=A1=8C=E8=AF=AD=E9=9F=B3=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=92=AD=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/module/v2x/V2XModuleProvider.java | 10 +++++++++- .../module/v2x/adapter/V2XShareEventAdapter.java | 15 ++++++++------- .../module/v2x/fragment/V2XEventPanelFragment.kt | 6 +++++- .../v2x/fragment/V2XShareEventsFragment.java | 14 ++++++++------ .../scenario/scene/road/V2XRoadVideoWindow.java | 4 ---- 5 files changed, 30 insertions(+), 19 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java index 7f97170eda..b2366f3acb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XModuleProvider.java @@ -25,6 +25,7 @@ import com.mogo.map.navi.IMogoNaviListener; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.common.ModuleNames; import com.mogo.module.common.entity.MarkerExploreWay; +import com.mogo.module.common.entity.MarkerExploreWayItem; import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.common.entity.V2XMessageEntity; @@ -50,7 +51,7 @@ import com.mogo.service.statusmanager.StatusDescriptor; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; import com.mogo.utils.storage.SharedPrefsMgr; - +import static com.mogo.module.v2x.VideoInitKt.initVideo; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -229,6 +230,12 @@ public class V2XModuleProvider implements Log.d(TAG,"onMarkerClicked2222"); //点击的marker的具体数据 MarkerExploreWay exploreWay = extractFromMarker(marker); + MarkerExploreWayItem item = exploreWay.getItems().get(0); + String path = item.getUrl(); + if (path.contains(".mp4")){ + initVideo(); + } + V2XRoadEventEntity roadEventEntity = new V2XRoadEventEntity(); roadEventEntity.setNoveltyInfo(exploreWay); roadEventEntity.setPoiType(exploreWay.getPoiType()); @@ -256,6 +263,7 @@ public class V2XModuleProvider implements } }); + // 响应违章停车的POI点击 V2XServiceManager .getMogoRegisterCenter() 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 6116a83506..53f0c88824 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 @@ -61,12 +61,12 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter Date: Thu, 5 Nov 2020 21:11:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9B=BE=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=3D>progressbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/v2x/view/SimpleCoverVideoPlayer.kt | 12 ++++++------ .../layout/v2x_road_video_plyer_layout.xml | 19 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt index be83a6236d..3d2697ed9e 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/SimpleCoverVideoPlayer.kt @@ -83,12 +83,12 @@ class SimpleCoverVideoPlayer : StandardGSYVideoPlayer { } override fun updateStartImage() { - super.updateStartImage() - - when (mCurrentState) { - GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE - else -> start.visibility = View.INVISIBLE - } +// super.updateStartImage() +// +// when (mCurrentState) { +// GSYVideoView.CURRENT_STATE_PAUSE -> start.visibility = View.VISIBLE +// else -> start.visibility = View.INVISIBLE +// } } fun setFullClickListener(listener: OnClickListener) { diff --git a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml index d63bad4e6b..61ff05d18a 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/v2x_road_video_plyer_layout.xml @@ -28,8 +28,7 @@ android:layout_width="@dimen/dp_110" android:layout_height="@dimen/dp_110" android:layout_centerInParent="true" - android:scaleType="centerCrop" - android:src="@drawable/v2x_icon_live_logo" /> + android:scaleType="centerCrop" /> @@ -72,13 +71,13 @@ //加载中圈圈 - - - - - - - - + From c58adab9342494be0dc17a3ec98cf2683cc5ec80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 6 Nov 2020 10:40:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=A2=E5=94=A4?= =?UTF-8?q?=E9=86=92=E8=AF=8D=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java index f72f5e2e12..c220782a05 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/voice/V2XVoiceConstants.java @@ -242,7 +242,7 @@ public class V2XVoiceConstants { public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_YES_UN_WAKEUP_WORDS = {"封路了", "封了", "有封路", "确定"}; public static final String COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP = "COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP"; - public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP_WORDS = {"没注意", "没看到", "没有", "没封路", "取消", "关闭"}; + public static final String[] COMMAND_ZHIDAO_V2X_FEEDBACK_FENG_LU_NO_UN_WAKEUP_WORDS = {"不封路","没注意", "没看到", "没有", "没封路", "取消", "关闭"}; // 事故