diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java index fc3c160885..086d052c04 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeTrafficDialog.java @@ -70,21 +70,45 @@ public class NoticeTrafficDialog extends BaseFloatDialog { setContentView(R.layout.notice_dialog_traffic_police); setCanceledOnTouchOutside(true); playerShow();//视频播放器 - recyclerVie();//下方详情信息列表 + recyclerVie();//详情信息列表 + otherFunctionButton(); + } - accept = findViewById(R.id.accept_traffic); - refuse = findViewById(R.id.refuse_traffic); - accept.setOnClickListener(v -> { - feedBackTraffic(1); + /** + * 根据推送消息渲染顶部图片/视频 + * type 0图片 1视频 + */ + private void playerShow() { + mVideoPlayer = findViewById(R.id.video_player); + thumbnailImage = findViewById(R.id.thumbnail_image); + playImageView = this.findViewById(R.id.start_for_traffic); + playImageView.setOnClickListener(v -> { + startLive(); }); - refuse.setOnClickListener(v -> { - feedBackTraffic(0); + close = findViewById(R.id.notice_traffic_dialog_close); + close.setOnClickListener(v -> { + releasePlayer(); + dismiss(); }); - //重新连接 - findViewById(R.id.notice_connect).setOnClickListener(v -> { - requestTrafficInfo(); + if (mPushData.getType() == 1) { + startLive(); + } else { + MogoApisHandler.getInstance().getApis().getImageLoaderApi().displayImage(mPushData.getPoiImgUrl(), + thumbnailImage); + thumbnailImage.setVisibility(View.VISIBLE); + playImageView.setVisibility(View.INVISIBLE); + } + mVideoPlayer.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + if (mVideoPlayer.getCurrentState() == GSYVideoView.CURRENT_STATE_PAUSE) {/*播放中*/ + resume(); + } else { + pause(); + } + } }); - requestTrafficInfo(); + } private void recyclerVie() { @@ -106,15 +130,34 @@ public class NoticeTrafficDialog extends BaseFloatDialog { } + private void otherFunctionButton() { + accept = findViewById(R.id.accept_traffic); + refuse = findViewById(R.id.refuse_traffic); + accept.setOnClickListener(v -> { + feedBackTraffic(1); + }); + refuse.setOnClickListener(v -> { + feedBackTraffic(0); + }); + //重新连接 + findViewById(R.id.notice_connect).setOnClickListener(v -> { + requestTrafficInfo(); + }); + requestTrafficInfo(); + } + /** * @param i 是否接受交通事故任务 * 0不接收 1接受 发起自动驾驶任务,显示引导线 */ private void feedBackTraffic(int i) { CallerNoticeManager.getNoticeProvider().feedBackNoticeTraffic(mPushData.getInfoId(), MoGoAiCloudClientConfig.getInstance().getSn(), 1); - + if (i == 1) { + startAutoPilot(); + } } + /** * 开启自动驾驶 */ @@ -202,43 +245,6 @@ public class NoticeTrafficDialog extends BaseFloatDialog { adapter.notifyDataSetChanged(); } - /** - * 根据推送消息渲染顶部图片/视频 - * type 0图片 1视频 - */ - private void playerShow() { - mVideoPlayer = findViewById(R.id.video_player); - thumbnailImage = findViewById(R.id.thumbnail_image); - playImageView = this.findViewById(R.id.start_play); - playImageView.setOnClickListener(v -> { - startLive(); - }); - close = findViewById(R.id.notice_traffic_dialog_close); - close.setOnClickListener(v -> { - releasePlayer(); - dismiss(); - }); - if (mPushData.getType() == 1) { - startLive(); - } else { - MogoApisHandler.getInstance().getApis().getImageLoaderApi().displayImage(mPushData.getPoiImgUrl(), - thumbnailImage); - thumbnailImage.setVisibility(View.VISIBLE); - playImageView.setVisibility(View.INVISIBLE); - } - mVideoPlayer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (mVideoPlayer.getCurrentState() == GSYVideoView.CURRENT_STATE_PAUSE) {/*播放中*/ - resume(); - } else { - pause(); - } - } - }); - - } - /** * 暂停 */ diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml index 04a23a6c9d..c0cf14de98 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_traffic_police.xml @@ -55,7 +55,7 @@ app:layout_constraintTop_toTopOf="@id/video_player" /> 52px 35px - 26 + 26px 15px 600px