diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7f9f262a61..1230f12f86 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
diff --git a/core/function-impl/mogo-core-function-notice/build.gradle b/core/function-impl/mogo-core-function-notice/build.gradle
index e8c776714b..fc27273bad 100644
--- a/core/function-impl/mogo-core-function-notice/build.gradle
+++ b/core/function-impl/mogo-core-function-notice/build.gradle
@@ -56,6 +56,7 @@ dependencies {
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.mogoserviceapi
implementation rootProject.ext.dependencies.modulecommon
+ implementation rootProject.ext.dependencies.moduleHmi
} else {
api project(":foudations:mogo-commons")
api project(':services:mogo-service-api')
@@ -64,6 +65,7 @@ dependencies {
implementation project(':core:mogo-core-function-call')
implementation project(':core:mogo-core-res')
implementation project(':core:mogo-core-data')
+ implementation project(':core:function-impl:mogo-core-function-hmi')
}
}
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 810055ae58..9f65d6f79c 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,13 +2,5 @@
-
-
-
-
-
-
-
-
-
+
\ 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/NoticeProvider.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/NoticeProvider.java
index 719ea6b94f..c0dcf261e4 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
@@ -11,6 +11,7 @@ import com.mogo.eagle.core.data.constants.MogoServicePaths;
import com.mogo.eagle.core.data.notice.NoticePushData;
import com.mogo.eagle.core.function.api.notice.IMoGoNoticeProvider;
import com.mogo.eagle.core.function.call.notice.CallerNoticeManager;
+import com.mogo.eagle.core.function.hmi.ui.MoGoHmiFragment;
import com.mogo.eagle.core.function.notice.receiver.NoticeMessageListener;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.service.cloud.socket.IMogoLifecycleListener;
@@ -28,11 +29,13 @@ import org.jetbrains.annotations.Nullable;
public class NoticeProvider implements IMoGoNoticeProvider {
private String TAG = "AINotice";
private Context mContext;
+ private MoGoHmiFragment mMoGoHmiFragment;
@Nullable
@Override
public Fragment createCoverage(@Nullable Context context, @Nullable Bundle data) {
- return null;
+ mMoGoHmiFragment = new MoGoHmiFragment();
+ return mMoGoHmiFragment;
}
@NotNull
@@ -55,6 +58,6 @@ public class NoticeProvider implements IMoGoNoticeProvider {
@Override
public void showNoticeForTrafficWithData(NoticePushData 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.java b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.java
deleted file mode 100644
index 204382c0ff..0000000000
--- a/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.java
+++ /dev/null
@@ -1,42 +0,0 @@
-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.function.call.hmi.CallerHmiManager;
-import com.mogo.utils.logger.Logger;
-
-/**
- * @author Jing
- * @description 描述
- * @since: 10/28/21
- */
-public class TestNoticeBroadcastReceiver extends BroadcastReceiver {
- private String TAG = "notice";
- private Context mContext;
-
- @Override
- public void onReceive(Context context, Intent intent) {
- try {
- this.mContext = context;
- int sceneType = intent.getIntExtra("sceneType", 0);
- Logger.d(TAG, "textPanelOpenType:" + sceneType);
- // 分发场景
- dispatchSceneTest(sceneType);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void dispatchSceneTest(int sceneType) {
- if (sceneType == 301001) {
- NoticePushData pushData = new NoticePushData();
- pushData.setMsg("交警测试公告");
- pushData.setContent("交警测试公告内容");
-// CallerHmiManager.showTrafficBanner(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
new file mode 100644
index 0000000000..940972464c
--- /dev/null
+++ b/core/function-impl/mogo-core-function-notice/src/main/java/com/mogo/eagle/core/function/notice/test/TestNoticeBroadcastReceiver.kt
@@ -0,0 +1,39 @@
+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.function.call.hmi.CallerHmiManager
+import com.mogo.utils.logger.Logger
+
+/**
+ * @author Jing
+ * @description 测试类
+ * @since: 10/29/21
+ */
+class TestNoticeBroadcastReceiver: BroadcastReceiver() {
+ private val TAG = "notice"
+ private var mContext: Context? = null
+
+ override fun onReceive(context: Context?, intent: Intent) {
+ try {
+ mContext = context
+ val sceneType = intent.getIntExtra("sceneType", 0)
+ Logger.d(TAG, "textPanelOpenType:$sceneType")
+ // 分发场景
+ dispatchSceneTest(sceneType)
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+
+ private fun dispatchSceneTest(sceneType: Int) {
+ if (sceneType == 301001) {
+ val pushData = NoticePushData()
+ pushData.msg = "交警测试公告"
+ pushData.content = "交警测试公告内容"
+ CallerHmiManager.showTrafficBanner(pushData)
+ }
+ }
+}
\ No newline at end of file
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 dde11c55d2..7aaa7f35b7 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
@@ -133,8 +133,9 @@ object CallerHmiManager : CallerBase() {
*
* @param pushData
*/
- fun showTrafficBanner(pushData: NoticePushData) {
+ fun showTrafficBanner(pushData: NoticePushData?) {
noticeProviderApi.showNoticeForTrafficWithData(pushData)
}
+
}
\ No newline at end of file