diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index a2fb56d6fe..0064153088 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -38,6 +38,8 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation rootProject.ext.dependencies.kotlinstdlibjdk7 + implementation rootProject.ext.dependencies.androidxccorektx implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxrecyclerview implementation rootProject.ext.dependencies.androidxconstraintlayout @@ -48,7 +50,6 @@ dependencies { implementation rootProject.ext.dependencies.coroutinesandroid implementation rootProject.ext.dependencies.coroutinescore - implementation rootProject.ext.dependencies.kotlinstdlibjdk7 api "com.mogo.libs:hook:1.0" if (Boolean.valueOf(RELEASE)) { diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/utils/WarningUtils.kt b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/WarningUtils.kt similarity index 99% rename from modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/utils/WarningUtils.kt rename to modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/WarningUtils.kt index a4974ce23a..3433f6ed79 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/utils/WarningUtils.kt +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/WarningUtils.kt @@ -1,4 +1,4 @@ -package com.mogo.module.hmi.utils +package com.mogo.module.common.utils import com.mogo.module.common.enum.WarningTypeEnum import com.mogo.module.common.R @@ -7,7 +7,7 @@ import com.mogo.module.common.R * @author xiaoyuzhoukeyi * @date 2021/8/6 11:04 上午 */ -internal object WarningUtils { +object WarningUtils { fun getWarningIcon(v2xType: Int): Array { var warningIconId = R.drawable.icon_warning_v2x_abnormal_vehicle var warningContent = "注意周边环境" diff --git a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt index 9e75befce0..a02f4c2f78 100644 --- a/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt +++ b/modules/mogo-module-hmi/src/main/java/com/mogo/module/hmi/ui/MoGoWarningFragment.kt @@ -13,7 +13,7 @@ import com.mogo.module.hmi.notification.WarningFloat import com.mogo.module.hmi.notification.anim.DefaultAnimator import com.mogo.module.hmi.notification.enums.SidePattern import com.mogo.module.hmi.ui.widget.ViewV2XNotification -import com.mogo.module.hmi.utils.WarningUtils +import com.mogo.module.common.utils.WarningUtils import kotlinx.android.synthetic.main.fragment_warning.* /**