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 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/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 = {"不封路","没注意", "没看到", "没有", "没封路", "取消", "关闭"}; // 事故 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 @@ //加载中圈圈 - - - - - - - - +