From ebc451d00dc0f22e7ef85b9feec9617280498ab1 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Mon, 28 Nov 2022 10:21:47 +0800 Subject: [PATCH] [2.13.0]gradle --- .../mogo-core-function-bindingcar/build.gradle | 6 ------ .../function-impl/mogo-core-function-carcorder/build.gradle | 1 - core/function-impl/mogo-core-function-map/build.gradle | 2 -- .../function/business/identify/TrackerSourceColorHelper.kt | 6 +++--- core/function-impl/mogo-core-function-msgbox/build.gradle | 6 ------ foudations/mogo-commons/build.gradle | 2 -- modules/mogo-module-common/build.gradle | 6 ------ 7 files changed, 3 insertions(+), 26 deletions(-) diff --git a/core/function-impl/mogo-core-function-bindingcar/build.gradle b/core/function-impl/mogo-core-function-bindingcar/build.gradle index 111633d37e..e498d7efa5 100644 --- a/core/function-impl/mogo-core-function-bindingcar/build.gradle +++ b/core/function-impl/mogo-core-function-bindingcar/build.gradle @@ -52,12 +52,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.androidxconstraintlayout implementation rootProject.ext.dependencies.arouter implementation rootProject.ext.dependencies.rxandroid - implementation rootProject.ext.dependencies.androidxrecyclerview implementation rootProject.ext.dependencies.androidxroomruntime implementation rootProject.ext.dependencies.androidxroomktx implementation rootProject.ext.dependencies.litezxing @@ -71,7 +67,6 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_utils - implementation rootProject.ext.dependencies.mogo_core_res implementation rootProject.ext.dependencies.mogo_core_network implementation rootProject.ext.dependencies.mogo_core_function_call } else { @@ -81,7 +76,6 @@ dependencies { implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') - implementation project(':core:mogo-core-res') implementation project(':core:mogo-core-network') implementation project(':core:mogo-core-function-call') } diff --git a/core/function-impl/mogo-core-function-carcorder/build.gradle b/core/function-impl/mogo-core-function-carcorder/build.gradle index d612fd342f..dbef31ffe6 100644 --- a/core/function-impl/mogo-core-function-carcorder/build.gradle +++ b/core/function-impl/mogo-core-function-carcorder/build.gradle @@ -47,7 +47,6 @@ dependencies { implementation rootProject.ext.dependencies.coroutinescore implementation rootProject.ext.dependencies.arouter kapt rootProject.ext.dependencies.aroutercompiler - implementation rootProject.ext.dependencies.mogologlib if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { implementation rootProject.ext.dependencies.mogoserviceapi diff --git a/core/function-impl/mogo-core-function-map/build.gradle b/core/function-impl/mogo-core-function-map/build.gradle index 87a85a74c5..01e097ded7 100644 --- a/core/function-impl/mogo-core-function-map/build.gradle +++ b/core/function-impl/mogo-core-function-map/build.gradle @@ -80,7 +80,6 @@ dependencies { implementation rootProject.ext.dependencies.mogomap implementation rootProject.ext.dependencies.mogomapapi - implementation rootProject.ext.dependencies.moduleservice } else { implementation project(':modules:mogo-module-common') implementation project(':services:mogo-service-api') @@ -93,7 +92,6 @@ dependencies { implementation project(":libraries:mogo-map") implementation project(":libraries:mogo-map-api") - implementation project(':libraries:mogo-adas') } } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt index 6109b19a93..e4ae0f16f5 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/identify/TrackerSourceColorHelper.kt @@ -73,7 +73,7 @@ object TrackerSourceColorHelper { @SuppressLint("NewApi") fun isIPC(data: TrackedObject): Boolean { val source = data.trackedSourceList.stream().allMatch { - it.source != 4 + it.source != 2 } return source } @@ -84,11 +84,11 @@ object TrackerSourceColorHelper { @SuppressLint("NewApi") fun isObu(data: TrackedObject): Pair { val source = data.trackedSourceList.stream().anyMatch { - it.source == 4 + it.source == 2 } if (source) { val first = data.trackedSourceList.stream() - .filter { trackedSource: TrackedSource -> trackedSource.source == 4 }.findFirst() + .filter { trackedSource: TrackedSource -> trackedSource.source == 2}.findFirst() if (first.isPresent) { val subObu = first.get().subSourceList.stream().anyMatch { it.source == 1 diff --git a/core/function-impl/mogo-core-function-msgbox/build.gradle b/core/function-impl/mogo-core-function-msgbox/build.gradle index ea1bfe7e00..f1726248b0 100644 --- a/core/function-impl/mogo-core-function-msgbox/build.gradle +++ b/core/function-impl/mogo-core-function-msgbox/build.gradle @@ -55,21 +55,15 @@ dependencies { implementation rootProject.ext.dependencies.androidxroomktx if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { -// implementation rootProject.ext.dependencies.modulecommon -// implementation rootProject.ext.dependencies.moduleservice implementation rootProject.ext.dependencies.mogo_core_data implementation rootProject.ext.dependencies.mogo_core_utils implementation rootProject.ext.dependencies.mogo_core_function_api implementation rootProject.ext.dependencies.mogo_core_function_call - implementation rootProject.ext.dependencies.mogo_core_res } else { -// implementation project(':modules:mogo-module-common') -// implementation project(':modules:mogo-module-service') implementation project(':core:mogo-core-data') implementation project(':core:mogo-core-utils') implementation project(':core:mogo-core-function-api') implementation project(':core:mogo-core-function-call') - implementation project(':core:mogo-core-res') } } diff --git a/foudations/mogo-commons/build.gradle b/foudations/mogo-commons/build.gradle index 585c2ce5e7..296811e92f 100644 --- a/foudations/mogo-commons/build.gradle +++ b/foudations/mogo-commons/build.gradle @@ -45,7 +45,6 @@ dependencies { implementation rootProject.ext.dependencies.amapnavi3dmap if (Boolean.valueOf(USE_MAVEN_PACKAGE)) { - implementation rootProject.ext.dependencies.mogo_core_utils api rootProject.ext.dependencies.mogoaicloudservicesdk api rootProject.ext.dependencies.ttsbase @@ -53,7 +52,6 @@ dependencies { implementation rootProject.ext.dependencies.mogo_core_utils api rootProject.ext.dependencies.mogo_core_network } else { - implementation project(':core:mogo-core-utils') api project(":foudations:mogo-aicloud-services-sdk") api project(":tts:tts-base") diff --git a/modules/mogo-module-common/build.gradle b/modules/mogo-module-common/build.gradle index beb04e3c10..9c162e334c 100644 --- a/modules/mogo-module-common/build.gradle +++ b/modules/mogo-module-common/build.gradle @@ -55,12 +55,6 @@ dependencies { api rootProject.ext.dependencies.mogoaicloudrealtime - implementation rootProject.ext.dependencies.coroutinesandroid - implementation rootProject.ext.dependencies.coroutinescore - - implementation rootProject.ext.dependencies.mogoobuold - implementation rootProject.ext.dependencies.mogoobu - annotationProcessor 'com.elegant.spi:compiler:1.0.3' if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {