yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'co' into dev

Browse Source
This commit is contained in:
liujing
2020-10-19 19:21:02 +08:00
parent ddc5ba8188 33006f843f
commit c418ac9a5a
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java
View File

@@ -197,15 +197,26 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
mUserInfo = mNoveltyInfo.getUserInfo();
if (!ArrayUtils.isEmpty(mNoveltyInfo.getItems())) {
String imgUrl = mNoveltyInfo.getItems().get(0).getThumbnail();
String url = mNoveltyInfo.getItems().get(0).getUrl();
if (TextUtils.isEmpty(imgUrl)) {
imgUrl = mNoveltyInfo.getItems().get(0).getUrl();
}
if (!TextUtils.isEmpty(imgUrl)) {
V2XServiceManager.getImageLoader()
.displayImage(imgUrl, ivEventImg);
}
if (url.contains(".mp4")) {
ivEventImg.setOnClickListener(v -> {
showRoadVideoInfo(v2XEventShowEntity);
});
ivEventPlay.setOnClickListener(v -> {
showRoadVideoInfo(v2XEventShowEntity);
});
ivEventPlay.setVisibility(VISIBLE);
} else {
ivEventImg.setOnClickListener(null);
ivEventPlay.setOnClickListener(null);
ivEventPlay.setVisibility(GONE);
}
}
if (mNoveltyInfo.getUserInfo() != null &&
@@ -277,22 +288,23 @@ public class V2XRoadEventVH extends V2XBaseViewHolder<V2XEventShowEntity> {
}
/*
* 展示事件的图片/视频资源
* */
private void showRoadVideoInfo(V2XEventShowEntity v2XEventShowEntity){
if (v2XEventShowEntity != null){
* 展示事件的图片/视频资源
* */
private void showRoadVideoInfo(V2XEventShowEntity v2XEventShowEntity) {
if (v2XEventShowEntity != null) {
/*
* MarkerExploreWay 具体事件
* V2XRoadEventEntity 包含MarkerExploreWay 事件的二次封装(tts播报内容 事件类型等)
* V2XMessageEntity 三次封装(是否进行事件与本机连线 是否显示通话功能等)
* V2XEventShowEntity 包含V2XRoadEventEntity
* */
Log.d(TAG,"马上展示图片/视频资源全屏");
* MarkerExploreWay 具体事件
* V2XRoadEventEntity 包含MarkerExploreWay 事件的二次封装(tts播报内容 事件类型等)
* V2XMessageEntity 三次封装(是否进行事件与本机连线 是否显示通话功能等)
* V2XEventShowEntity 包含V2XRoadEventEntity
* */
Log.d(TAG, "马上展示图片/视频资源全屏");
V2XMessageEntity v2XMessageEntity = new V2XMessageEntity<>();
v2XMessageEntity.setContent(v2XEventShowEntity);
V2XRoadVideoCarScenario.getInstance().init(v2XMessageEntity);
}
}
/**
* 展示直播信息
*

8
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
View File

@@ -37,7 +37,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
private V2XWindowStatusListener mV2XWindowStatusListener;
private TextureVideoView mVideoView;
private ImageView closeImage;
private MogoImageView bigImage;
public V2XRoadVideoWindow() {
this(V2XServiceManager.getContext(), null);
@@ -59,7 +58,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
private void initView(Context context) {
LayoutInflater.from(context).inflate(R.layout.window_road_video, this);
mVideoView = findViewById(R.id.roadVideoView);
bigImage = findViewById(R.id.big_image);
closeImage = findViewById(R.id.roadVideoClose);
closeImage.setOnClickListener(v -> {
close();
@@ -79,7 +77,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
}
if (path.contains(".mp4")) {
mVideoView.setVisibility(VISIBLE);
bigImage.setVisibility(View.GONE);
mVideoView.setVideoPath(path);
mVideoView.setOnPreparedListener(mediaPlayer -> {
Logger.w(MODULE_NAME, "全屏准备。。。。。");
@@ -91,11 +88,6 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
}
});
mVideoView.start();
} else {
bigImage.setVisibility(View.VISIBLE);
mVideoView.setVisibility(View.GONE);
V2XServiceManager.getImageLoader()
.displayImage(path, bigImage);
}
}