From 62f6609eafb5485dec1e0a50fc55455f9d8fdc72 Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 29 Oct 2021 16:51:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E7=A7=B0,=E6=B7=BB=E5=8A=A0push=E5=86=85=E5=AE=B9=E4=BD=93?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/MoGoHmiFragment.kt | 6 ++--- .../function/hmi/ui/MoGoWarningContract.kt | 6 ++--- .../hmi/ui/notice/NoticeBannerView.java | 4 ++-- .../core/function/notice/NoticeProvider.java | 4 ++-- .../test/TestNoticeBroadcastReceiver.kt | 4 ++-- .../data/notice/NoticeNormalDetailData.kt | 1 - ...cInfo.java => NoticeTrafficStyleInfo.java} | 2 +- ...a.java => NoticeTrafficStylePushData.java} | 23 +++++++++++++------ .../api/notice/IMoGoNoticeProvider.java | 4 ++-- .../function/call/hmi/CallerHmiManager.kt | 8 +++---- .../call/notice/CallerNoticeManager.java | 1 - 11 files changed, 35 insertions(+), 28 deletions(-) rename core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/{NoticeTrafficInfo.java => NoticeTrafficStyleInfo.java} (96%) rename core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/{NoticePushData.java => NoticeTrafficStylePushData.java} (72%) diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 9dd9b171d2..2dac3b397b 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -9,7 +9,7 @@ import android.view.animation.OvershootInterpolator import com.mogo.commons.mvp.MvpFragment import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.data.enums.WarningDirectionEnum -import com.mogo.eagle.core.data.notice.NoticePushData +import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.hmi.R import com.mogo.eagle.core.function.hmi.notification.WarningFloat @@ -210,9 +210,9 @@ class MoGoHmiFragment : MvpFragment /** * 展示云公告顶部弹窗 - * @param pushData + * @param trafficStylePushData */ - override fun showNoticeForTrafficWithData(pushData: NoticePushData) { + override fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData) { activity.let { val noticeBannerView = this.getContext()?.let { it1 -> NoticeBannerView(it1) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt index e635cd947a..a22ee3ede8 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoWarningContract.kt @@ -2,7 +2,7 @@ package com.mogo.eagle.core.function.hmi.ui import com.mogo.commons.mvp.IView import com.mogo.eagle.core.data.enums.WarningDirectionEnum -import com.mogo.eagle.core.data.notice.NoticePushData +import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener @@ -99,8 +99,8 @@ interface MoGoWarningContract { /** * 展示云公告顶部弹窗 - * @param pushData + * @param trafficStylePushData */ - fun showNoticeForTrafficWithData(pushData: NoticePushData) + fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData) } } \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java index c010b81109..92f4dac050 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeBannerView.java @@ -10,7 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; -import com.mogo.eagle.core.data.notice.NoticeTrafficInfo; +import com.mogo.eagle.core.data.notice.NoticeTrafficStyleInfo; import com.mogo.eagle.core.function.hmi.R; /** @@ -61,7 +61,7 @@ public class NoticeBannerView extends ConstraintLayout { } //数据改变刷新UI - public void pushBeanChanged(NoticeTrafficInfo info){ + public void pushBeanChanged(NoticeTrafficStyleInfo info){ } } diff --git a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java index a43354bde4..fe06e5e7e6 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java +++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment; import com.alibaba.android.arouter.facade.annotation.Route; import com.mogo.eagle.core.data.constants.MogoServicePaths; import com.mogo.eagle.core.data.notice.NoticeNormalData; -import com.mogo.eagle.core.data.notice.NoticePushData; +import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData; import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider; import com.mogo.eagle.core.function.hmi.ui.MoGoHmiFragment; @@ -54,7 +54,7 @@ public class NoticeProvider implements IMoGoNoticeProvider { } @Override - public void showNoticeForTrafficWithData(NoticePushData pushData) { + public void showNoticeForTrafficWithData(NoticeTrafficStylePushData pushData) { mMoGoHmiFragment.showNoticeForTrafficWithData(pushData); } 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 940972464c..c73a67cf36 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 @@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.notice.test import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import com.mogo.eagle.core.data.notice.NoticePushData +import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.utils.logger.Logger @@ -30,7 +30,7 @@ class TestNoticeBroadcastReceiver: BroadcastReceiver() { private fun dispatchSceneTest(sceneType: Int) { if (sceneType == 301001) { - val pushData = NoticePushData() + val pushData = NoticeTrafficStylePushData() pushData.msg = "交警测试公告" pushData.content = "交警测试公告内容" CallerHmiManager.showTrafficBanner(pushData) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeNormalDetailData.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeNormalDetailData.kt index 7c5bed5eea..b2f38e5fea 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeNormalDetailData.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeNormalDetailData.kt @@ -18,5 +18,4 @@ data class NoticeNormalDetailData( var videoUrl: String = "", //视频地址 var fileType: Int = 0, // 1图片，2视频 val tts: String = "", //语音播报词 - ) diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficInfo.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java similarity index 96% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficInfo.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java index fc06e8d6a5..5ac3e7863c 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficInfo.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStyleInfo.java @@ -7,7 +7,7 @@ import java.io.Serializable; * @description 交通事故任务详情数据bean * @since: 10/26/21 */ -public class NoticeTrafficInfo implements Serializable { +public class NoticeTrafficStyleInfo implements Serializable { private String infoId;//事故id private String poiType;//事故类型 private long dataCreateTime;//事故发生时间 diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticePushData.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStylePushData.java similarity index 72% rename from core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticePushData.java rename to core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStylePushData.java index a69215dcc5..5426355b49 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticePushData.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/notice/NoticeTrafficStylePushData.java @@ -5,10 +5,11 @@ package com.mogo.eagle.core.data.notice; * @description 交警任务公告推送消息体 * @since: 10/28/21 */ -public class NoticePushData { +public class NoticeTrafficStylePushData { private String msg; private String infoId; - private String imageUrl; + private String poiImgUrl; + private String title; private String isVideo; private String content; @@ -28,12 +29,20 @@ public class NoticePushData { this.infoId = infoId; } - public String getImageUrl() { - return imageUrl; + public String getTitle() { + return title; } - public void setImageUrl(String imageUrl) { - this.imageUrl = imageUrl; + public void setTitle(String title) { + this.title = title; + } + + public String getPoiImgUrl() { + return poiImgUrl; + } + + public void setPoiImgUrl(String poiImgUrl) { + this.poiImgUrl = poiImgUrl; } public String getIsVideo() { @@ -57,7 +66,7 @@ public class NoticePushData { return "NoticePushData{" + "msg='" + msg + '\'' + ", infoId='" + infoId + '\'' + - ", imageUrl='" + imageUrl + '\'' + + ", imageUrl='" + poiImgUrl + '\'' + ", isVideo='" + isVideo + '\'' + ", content='" + content + '\'' + '}'; diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/notice/IMoGoNoticeProvider.java b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/notice/IMoGoNoticeProvider.java index df334a28af..a96dd048d8 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/notice/IMoGoNoticeProvider.java +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/notice/IMoGoNoticeProvider.java @@ -1,7 +1,7 @@ package com.mogo.eagle.core.function.api.notice; import com.mogo.eagle.core.data.notice.NoticeNormalData; -import com.mogo.eagle.core.data.notice.NoticePushData; +import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData; import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider; /** @@ -16,7 +16,7 @@ public interface IMoGoNoticeProvider extends IMoGoFunctionProvider { * * @param pushData 推送消息体 */ - void showNoticeForTrafficWithData(NoticePushData pushData); + void showNoticeForTrafficWithData(NoticeTrafficStylePushData pushData); /** * 呈现普通公告顶部弹框 diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt index 9dde3d9a26..e526c63dbf 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt @@ -3,7 +3,7 @@ package com.mogo.eagle.core.function.call.hmi import com.mogo.eagle.core.data.constants.MogoServicePaths import com.mogo.eagle.core.data.enums.WarningDirectionEnum import com.mogo.eagle.core.data.notice.NoticeNormalData -import com.mogo.eagle.core.data.notice.NoticePushData +import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider @@ -132,10 +132,10 @@ object CallerHmiManager : CallerBase() { /** * 呈现交通云公告弹窗(hmi) * - * @param pushData + * @param trafficStylePushData */ - fun showTrafficBanner(pushData: NoticePushData?) { - noticeProviderApi.showNoticeForTrafficWithData(pushData) + fun showTrafficBanner(trafficStylePushData: NoticeTrafficStylePushData?) { + noticeProviderApi.showNoticeForTrafficWithData(trafficStylePushData) } /** diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/notice/CallerNoticeManager.java b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/notice/CallerNoticeManager.java index 57566c26b9..ad92134aed 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/notice/CallerNoticeManager.java +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/notice/CallerNoticeManager.java @@ -1,6 +1,5 @@ package com.mogo.eagle.core.function.call.notice; -import com.mogo.eagle.core.data.notice.NoticePushData; import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider; import com.mogo.eagle.core.function.call.base.CallerBase;