[Merge]解决合并冲突

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2021-11-10 19:22:19 +08:00
parent 756788ae7d
commit d1283c9ad9
1 changed files with 1 additions and 1 deletions
--- 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
@@ -319,7 +319,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
        }
    }

-    override fun showNoticeNormalData(normalData: NoticeNormalData) {
+    override fun showNoticeNormalData(normalData: NoticeNormalData?) {
        ThreadUtils.runOnUiThread {
            activity.let {
                val noticeBannerView = this.context?.let { it1 -> NoticeNormalBannerView(it1) }