From e68514031f5cf39d2f0c7a35b04bec8cb3a65ff0 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 5 Nov 2021 14:37:57 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=8E=A5=E5=8F=97=E4=BA=8B=E6=95=85?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=B0=83=E8=B5=B7=E8=87=AA=E5=8A=A8=E9=A9=BE?= =?UTF-8?q?=E9=A9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmi/ui/notice/NoticeTrafficDialog.java | 31 +++++++++++++----- .../notice_dialog_check_with_accessory.xml | 2 +- .../layout/notice_dialog_traffic_police.xml | 4 +-- .../res/values-xhdpi-2560x1440/dimens.xml | 1 + .../src/main/res/values/dimens.xml | 1 + .../test/TestNoticeBroadcastReceiver.kt | 6 ++++ .../data/notice/NoticeTrafficStyleInfo.java | 22 ++++++++++++- ...k_clore_close.png => dark_color_close.png} | Bin .../main/res/drawable/dark_color_close.png | Bin 0 -> 4305 bytes 9 files changed, 55 insertions(+), 12 deletions(-) rename core/mogo-core-res/src/main/res/drawable-xhdpi/{dark_clore_close.png => dark_color_close.png} (100%) create mode 100644 core/mogo-core-res/src/main/res/drawable/dark_color_close.png 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 04e8e214fa..43eb4d3615 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 @@ -12,10 +12,12 @@ import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.mogo.cloud.passport.MoGoAiCloudClientConfig; +import com.mogo.eagle.core.data.autopilot.AutopilotControlParameters; import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo; import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData; import com.mogo.eagle.core.data.notice.NoticeValue; import com.mogo.eagle.core.function.api.notice.NoticeNetCallBack; +import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager; import com.mogo.eagle.core.function.call.notice.CallerNoticeManager; import com.mogo.eagle.core.function.hmi.R; import com.mogo.eagle.core.widget.media.video.NoticeSimpleSmallVideoPlayer; @@ -51,17 +53,12 @@ public class NoticeTrafficDialog extends BaseFloatDialog { private TextView refuse;//拒绝 private NoticeTrafficAdapter adapter; private ArrayList dataArrayList = new ArrayList(); + private NoticeTrafficStyleInfo mTrafficStyleInfo; public NoticeTrafficDialog(@NonNull Context context, NoticeTrafficStylePushData pushData) { super(context); mContext = context; mPushData = pushData; - //图片 - String image = "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fc-ssl.duitang.com%2Fuploads%2Fitem%2F201609%2F26%2F20160926081306_GM2tv.thumb.1000_0.jpeg&refer=http%3A%2F%2Fc-ssl.duitang.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1638511084&t=92def7498b526dcba3fceda17c43fcb8"; - String video = "https://vd2.bdstatic.com/mda-mk1347dzxdmcre0y/sc/cae_h264/1635819498112313003/mda-mk1347dzxdmcre0y.mp4?v_from_s=hkapp-haokan-tucheng&auth_key=1635837585-0-0-5295f6658c7711ba7b4d3ef478a7fbaa&bcevod_channel=searchbox_feed&pd=1&pt=3&abtest="; - mPushData.setPoiImgUrl(video); - mPushData.setType(1); - mPushData.setInfoId("905543067497902080"); initView(); } @@ -108,10 +105,27 @@ public class NoticeTrafficDialog extends BaseFloatDialog { /** * @param i 是否接受交通事故任务 - * 0不接收 1接受 + * 0不接收 1接受 发起自动驾驶任务,显示引导线 */ private void feedBackTraffic(int i) { CallerNoticeManager.getNoticeProvider().feedBackNoticeTraffic(mPushData.getInfoId(), MoGoAiCloudClientConfig.getInstance().getSn(), 1); + + } + + /** + * 开启自动驾驶 + */ + private void startAutoPilot() { + AutopilotControlParameters parameters = new AutopilotControlParameters(); + parameters.isSpeakVoice = false; + parameters.vehicleType = 10; + AutopilotControlParameters.AutoPilotLonLat startLocation = new AutopilotControlParameters.AutoPilotLonLat + (MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(), + MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat()); + parameters.startLatLon = startLocation; + AutopilotControlParameters.AutoPilotLonLat endLocation = new AutopilotControlParameters.AutoPilotLonLat + (mTrafficStyleInfo.getLon(), mTrafficStyleInfo.getLat()); + parameters.endLatLon = endLocation; } /** @@ -126,6 +140,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog { trafficInfo.setPoiType("交通事故"); trafficInfo.setOperaStatus("已处理"); trafficInfo.setTroubleReasonName("逆向"); + mTrafficStyleInfo = trafficInfo; infoRefresh(trafficInfo); } }); @@ -191,7 +206,7 @@ public class NoticeTrafficDialog extends BaseFloatDialog { private void playerShow() { mVideoPlayer = findViewById(R.id.video_player); thumbnailImage = findViewById(R.id.thumbnail_image); - playImageView = this.findViewById(R.id.notice_start); + playImageView = this.findViewById(R.id.start); playImageView.setOnClickListener(v -> { startLive(); }); diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml index 560a232411..df90516a23 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/notice_dialog_check_with_accessory.xml @@ -13,7 +13,7 @@ android:layout_marginLeft="@dimen/dp_40" android:layout_marginTop="@dimen/dp_40" android:scaleType="fitXY" - android:src="@drawable/dark_clore_close" + android:src="@drawable/dark_color_close" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" tools:ignore="ContentDescription" /> 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 2db104ddcc..235a194cb6 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 @@ -13,7 +13,7 @@ android:layout_marginLeft="@dimen/dp_40" android:layout_marginTop="@dimen/dp_40" android:scaleType="fitXY" - android:src="@drawable/dark_clore_close" + android:src="@drawable/dark_color_close" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" tools:ignore="ContentDescription" /> @@ -56,7 +56,7 @@ app:layout_constraintTop_toTopOf="@id/video_player" /> 80px 150px 180px + 200px 220px 395px 580px diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml index 48d41bd53e..2175f06619 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/values/dimens.xml @@ -27,6 +27,7 @@ 80px 150px 180px + 200px 220px 395px 580px diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt index b7d15df12b..1967f2df49 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt @@ -35,6 +35,12 @@ class TestNoticeBroadcastReceiver : BroadcastReceiver() { val pushData = NoticeTrafficStylePushData() pushData.msg = "交警测试公告" pushData.content = "交警测试公告内容" + //图片 + val image: String = "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fc-ssl.duitang.com%2Fuploads%2Fitem%2F201609%2F26%2F20160926081306_GM2tv.thumb.1000_0.jpeg&refer=http%3A%2F%2Fc-ssl.duitang.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1638511084&t=92def7498b526dcba3fceda17c43fcb8" + //视频 + pushData.poiImgUrl = "https://vd2.bdstatic.com/mda-mk1347dzxdmcre0y/sc/cae_h264/1635819498112313003/mda-mk1347dzxdmcre0y.mp4?v_from_s=hkapp-haokan-tucheng&auth_key=1635837585-0-0-5295f6658c7711ba7b4d3ef478a7fbaa&bcevod_channel=searchbox_feed&pd=1&pt=3&abtest=" + pushData.type = 1 + pushData.infoId = "905543067497902080" CallerHmiManager.showTrafficBanner(pushData) } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java index bcb1d2a1ed..fc185f1595 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java @@ -16,7 +16,9 @@ public class NoticeTrafficStyleInfo extends BaseData { private long dataHandleTime;//事故处理时间 private String operaStatus;//事故处理状态 private String troubleReasonName;//事故原因 - private String uploadAddress;//事故地点 + private String uploadAddress;//事故地点名称 + private double lat;//纬度 + private double lon;//经度 public String getInfoId() { return infoId; @@ -74,6 +76,22 @@ public class NoticeTrafficStyleInfo extends BaseData { this.uploadAddress = uploadAddress; } + public double getLat() { + return lat; + } + + public void setLat(double lat) { + this.lat = lat; + } + + public double getLon() { + return lon; + } + + public void setLon(double lon) { + this.lon = lon; + } + @Override public String toString() { return "NoticeTrafficStyleInfo{" + @@ -84,6 +102,8 @@ public class NoticeTrafficStyleInfo extends BaseData { ", operaStatus='" + operaStatus + '\'' + ", troubleReasonName='" + troubleReasonName + '\'' + ", uploadAddress='" + uploadAddress + '\'' + + ", lat=" + lat + + ", lon=" + lon + '}'; } } diff --git a/core/mogo-core-res/src/main/res/drawable-xhdpi/dark_clore_close.png b/core/mogo-core-res/src/main/res/drawable-xhdpi/dark_color_close.png similarity index 100% rename from core/mogo-core-res/src/main/res/drawable-xhdpi/dark_clore_close.png rename to core/mogo-core-res/src/main/res/drawable-xhdpi/dark_color_close.png diff --git a/core/mogo-core-res/src/main/res/drawable/dark_color_close.png b/core/mogo-core-res/src/main/res/drawable/dark_color_close.png new file mode 100644 index 0000000000000000000000000000000000000000..ba03e033d8aeaa1d4a410b37b63b081a0084165b GIT binary patch literal 4305 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 literal 0 HcmV?d00001