From f64826c57d6737d4bb0f54b81d8df3d2c83ad04d Mon Sep 17 00:00:00 2001 From: liujing Date: Fri, 29 Oct 2021 18:28:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=20-=20=E4=BA=A4=E8=AD=A6=E7=B1=BB=E5=9E=8B=E5=85=AC?= =?UTF-8?q?=E5=91=8A=E5=BC=B9=E6=A1=86=E6=8F=90=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/function/hmi/ui/MoGoHmiFragment.kt | 38 +++++++++++++++++++ .../hmi/warning/MoGoWarningProvider.kt | 4 +- .../src/main/AndroidManifest.xml | 11 +++++- .../test/TestNoticeBroadcastReceiver.kt | 6 ++- 4 files changed, 55 insertions(+), 4 deletions(-) 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 2dac3b397b..6a295be501 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 @@ -215,7 +215,45 @@ class MoGoHmiFragment : MvpFragment override fun showNoticeForTrafficWithData(trafficStylePushData: NoticeTrafficStylePushData) { activity.let { val noticeBannerView = this.getContext()?.let { it1 -> NoticeBannerView(it1) } + mWarningFloat = it?.let { it1 -> + noticeBannerView?.let { it2 -> + WarningFloat.with(it1) + .setTag(tag) + .setLayout(it2) + .setSidePattern(SidePattern.TOP) + .setCountDownTime(5000) + .setGravity(Gravity.CENTER_HORIZONTAL, offsetY = 110) + .setImmersionStatusBar(true) + .addWarningStatusListener(null) + .addWarningStatusListener(object : IMoGoWarningStatusListener { + override fun onShow() { + // 创建弹窗成功才进行TTS播报 +// AIAssist.getInstance(activity) +// .speakTTSVoice("") + } + }) + .setAnimator(object : DefaultAnimator() { + override fun enterAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.enterAnim(view, params, windowManager, sidePattern)?.apply { + interpolator = OvershootInterpolator() + } + override fun exitAnim( + view: View, + params: WindowManager.LayoutParams, + windowManager: WindowManager, + sidePattern: SidePattern + ): Animator? = + super.exitAnim(view, params, windowManager, sidePattern)?.setDuration(200) + }) + .show() + } + } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.kt index b6263b04cd..44f7113ff3 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/warning/MoGoWarningProvider.kt @@ -92,7 +92,9 @@ class MoGoWarningProvider : IMoGoWaringProvider { } override fun showNoticeForTrafficWithData(pushData: NoticeTrafficStylePushData?) { - TODO("Not yet implemented") + if (pushData != null) { + mMoGoHmiFragment?.showNoticeForTrafficWithData(pushData) + }; } override fun showNoticeNormalData(normalData: NoticeNormalData?) { diff --git a/core/function-impl/mogo-core-function-notice/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-notice/src/main/AndroidManifest.xml index 9f65d6f79c..588f4336aa 100644 --- a/core/function-impl/mogo-core-function-notice/src/main/AndroidManifest.xml +++ b/core/function-impl/mogo-core-function-notice/src/main/AndroidManifest.xml @@ -2,5 +2,14 @@ - + + + + + + + + + + \ No newline at end of file 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 c73a67cf36..d6f4b07399 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,6 +3,7 @@ package com.mogo.eagle.core.function.notice.test import android.content.BroadcastReceiver import android.content.Context import android.content.Intent +import android.util.Log import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData import com.mogo.eagle.core.function.call.hmi.CallerHmiManager import com.mogo.utils.logger.Logger @@ -12,8 +13,8 @@ import com.mogo.utils.logger.Logger * @description 测试类 * @since: 10/29/21 */ -class TestNoticeBroadcastReceiver: BroadcastReceiver() { - private val TAG = "notice" +class TestNoticeBroadcastReceiver : BroadcastReceiver() { + private val TAG = "AINotice" private var mContext: Context? = null override fun onReceive(context: Context?, intent: Intent) { @@ -29,6 +30,7 @@ class TestNoticeBroadcastReceiver: BroadcastReceiver() { } private fun dispatchSceneTest(sceneType: Int) { + Log.d(TAG, "dispatchSceneTest::"+sceneType.toString()); if (sceneType == 301001) { val pushData = NoticeTrafficStylePushData() pushData.msg = "交警测试公告"