diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 5a0a6eb121..02988536df 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -29,7 +29,6 @@
-
diff --git a/app/build.gradle b/app/build.gradle
index bb61aecaf0..440d94d521 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,8 +105,6 @@ android {
}
}
- // 配置.so支持的CPU架构
- apply from: "./functions/abiFilters.gradle"
// 配置不同渠道参数，直接影响功能完整度
apply from: "./productFlavors/f8Amap.gradle"
apply from: "./productFlavors/f8xx.gradle"
@@ -172,6 +170,15 @@ dependencies {
implementation rootProject.ext.dependencies.moduleSmallMap
implementation rootProject.ext.dependencies.moduleobu
implementation rootProject.ext.dependencies.moduleADAS
+ implementation rootProject.ext.dependencies.mogomoduleback
+ implementation rootProject.ext.dependencies.mogomodulewidgets
+ implementation rootProject.ext.dependencies.modulemainlauncher
+ implementation rootProject.ext.dependencies.moduleapps
+ implementation rootProject.ext.dependencies.modulepushbase
+ implementation rootProject.ext.dependencies.modulepush
+ implementation rootProject.ext.dependencies.moduleleftpanelnoop
+ implementation rootProject.ext.dependencies.crashreportupgrade
+ implementation rootProject.ext.dependencies.crashreportbugly
} else {
implementation project(':foudations:mogo-aicloud-services-sdk')
implementation project(':foudations:mogo-commons')
@@ -189,17 +196,20 @@ dependencies {
implementation project(':modules:mogo-module-obu-mogo')
implementation project(':modules:mogo-module-hmi')
implementation project(':modules:mogo-module-adas')
+ implementation project(':modules:mogo-module-back')
+ implementation project(':modules:mogo-module-widgets')
+ implementation project(':main-extensions:mogo-module-main-launcher')
+ implementation project(':modules:mogo-module-apps')
+ implementation project(":modules:mogo-module-push-base")
+ implementation project(":modules:mogo-module-push")
+ implementation project(':modules:mogo-module-left-panel-noop')
+ implementation project(':test:crashreport-upgrade')
+ implementation project(':test:crashreport-bugly')
}
apply from: "./functions/basedmap.gradle"
- apply from: "./functions/perform.gradle"
- apply from: "./functions/socketpush.gradle"
- apply from: "./functions/leftpanel.gradle"
apply from: "./functions/skin.gradle"
- apply from: "./functions/crashreport.gradle"
- apply from: "./functions/widgets.gradle"
apply from: "./functions/tts.gradle"
- apply from: "./functions/backwidget.gradle"
apply from: "./functions/och.gradle"
// implementation group: "com.tencent.matrix", name: "matrix-android-lib", version: '0.6.6', changing: true
diff --git a/app/functions/abiFilters.gradle b/app/functions/abiFilters.gradle
deleted file mode 100644
index 231565ac78..0000000000
--- a/app/functions/abiFilters.gradle
+++ /dev/null
@@ -1,76 +0,0 @@
-// 将 install 和 assemble 任务按功能分组
-
-project.android.productFlavors {
- // f系列-网约车-出租车
- fochtaxi {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "arm64-v8a"
- }
- }
- }
- // f系列-网约车小巴车
- fochbus {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "arm64-v8a"
- }
- }
- }
- // f系列-分体机全系列，未细分
- f8xx {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "arm64-v8a"
- }
- }
- }
- // 联想Pad
- fPadLenovo {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "arm64-v8a"
- }
- }
- }
- // 联想Pad
- fPadLenovoOchTaxi {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "arm64-v8a"
- }
- }
- }
- // 联想Pad
- fPadLenovoOchBus {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "arm64-v8a"
- }
- }
- }
- // f系列-分体机
- f80x {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "arm64-v8a"
- }
- }
- }
- // f系列-分体机-高德
- f8Amap {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "armeabi-v7a"
- }
- }
- }
-}
\ No newline at end of file
diff --git a/app/functions/backwidget.gradle b/app/functions/backwidget.gradle
deleted file mode 100644
index 6763cd6271..0000000000
--- a/app/functions/backwidget.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-// 返回桌面悬浮按钮
-
-project.dependencies {
- if (Boolean.valueOf(RELEASE)) {
- launcherImplementation rootProject.ext.dependencies.mogomoduleback
- } else {
- launcherImplementation project(':modules:mogo-module-back')
- }
-}
\ No newline at end of file
diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle
deleted file mode 100644
index 50f4a7bdfe..0000000000
--- a/app/functions/bizguide.gradle
+++ /dev/null
@@ -1,26 +0,0 @@
-// 引导模块：部分机型暂不需要引导模块
-
-project.dependencies {
- if (Boolean.valueOf(RELEASE)) {
- f8xxImplementation rootProject.ext.dependencies.mogomoduleguide
- f80xImplementation rootProject.ext.dependencies.mogomoduleguide
- f8AmapImplementation rootProject.ext.dependencies.mogomoduleguide
-
- fochtaxiImplementation rootProject.ext.dependencies.mogomoduleguide
- fochbusImplementation rootProject.ext.dependencies.mogomoduleguide
-
- fPadLenovoImplementation rootProject.ext.dependencies.mogomoduleguide
- fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogomoduleguide
- fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogomoduleguide
- } else {
- f8xxImplementation project(':modules:mogo-module-guide')
- f80xImplementation project(':modules:mogo-module-guide')
- f8AmapImplementation project(':modules:mogo-module-guide')
- fochtaxiImplementation project(':modules:mogo-module-guide')
- fochbusImplementation project(':modules:mogo-module-guide')
-
- fPadLenovoImplementation project(':modules:mogo-module-guide')
- fPadLenovoOchTaxiImplementation project(':modules:mogo-module-guide')
- fPadLenovoOchBusImplementation project(':modules:mogo-module-guide')
- }
-}
\ No newline at end of file
diff --git a/app/functions/crashreport.gradle b/app/functions/crashreport.gradle
deleted file mode 100644
index da0ebfd96a..0000000000
--- a/app/functions/crashreport.gradle
+++ /dev/null
@@ -1,14 +0,0 @@
-// bugly 上报，目前仅在debug编译下加载bugly
-project.dependencies {
- if (Boolean.valueOf(RELEASE)) {
- implementation rootProject.ext.dependencies.crashreport
- implementation rootProject.ext.dependencies.crashreportupgrade
- debugImplementation rootProject.ext.dependencies.crashreportbugly
- releaseImplementation rootProject.ext.dependencies.crashreportbugly
- } else {
- implementation project(':test:crashreport')
- implementation project(':test:crashreport-upgrade')
- implementation project(':test:crashreport-bugly')
- releaseImplementation project(':test:crashreport-bugly')
- }
-}
\ No newline at end of file
diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle
deleted file mode 100644
index 15a7509e9b..0000000000
--- a/app/functions/leftpanel.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-// 辅助驾驶占位模块，目前部分车机不上辅助驾驶功能，使用该模块能力代替
-
-project.dependencies {
- if (Boolean.valueOf(RELEASE)) {
- f8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
- f80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop
- f8AmapImplementation rootProject.ext.dependencies.moduleleftpanelnoop
-
- fochtaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop
- fochbusImplementation rootProject.ext.dependencies.moduleleftpanelnoop
-
- fPadLenovoImplementation rootProject.ext.dependencies.moduleleftpanelnoop
- fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.moduleleftpanelnoop
- fPadLenovoOchBusImplementation rootProject.ext.dependencies.moduleleftpanelnoop
-
- } else {
- f8xxImplementation project(':modules:mogo-module-left-panel-noop')
- f80xImplementation project(':modules:mogo-module-left-panel-noop')
- f8AmapImplementation project(':modules:mogo-module-left-panel-noop')
-
- fochtaxiImplementation project(':modules:mogo-module-left-panel-noop')
- fochbusImplementation project(':modules:mogo-module-left-panel-noop')
-
- fPadLenovoImplementation project(':modules:mogo-module-left-panel-noop')
- fPadLenovoOchTaxiImplementation project(':modules:mogo-module-left-panel-noop')
- fPadLenovoOchBusImplementation project(':modules:mogo-module-left-panel-noop')
- }
-}
\ No newline at end of file
diff --git a/app/functions/perform.gradle b/app/functions/perform.gradle
deleted file mode 100644
index 2e8bfa149b..0000000000
--- a/app/functions/perform.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-// 表现：独立 app 和 launcher
-
-project.dependencies {
- if (Boolean.valueOf(RELEASE)) {
- launcherImplementation rootProject.ext.dependencies.modulemainlauncher
-
- // 仅launcher需要引入该模块
- launcherImplementation rootProject.ext.dependencies.moduleapps
- } else {
- launcherImplementation project(':main-extensions:mogo-module-main-launcher')
-
- // 仅launcher需要引入该模块
- launcherImplementation project(':modules:mogo-module-apps')
- }
-}
\ No newline at end of file
diff --git a/app/functions/socketpush.gradle b/app/functions/socketpush.gradle
deleted file mode 100644
index e3e7833d1b..0000000000
--- a/app/functions/socketpush.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-// 基于socket长链的push推送
-
-project.dependencies {
- if (Boolean.valueOf(RELEASE)) {
- implementation rootProject.ext.dependencies.modulepushbase
- launcherImplementation rootProject.ext.dependencies.modulepush
- } else {
- implementation project(":modules:mogo-module-push-base")
- launcherImplementation project(":modules:mogo-module-push")
- }
-}
\ No newline at end of file
diff --git a/app/functions/widgets.gradle b/app/functions/widgets.gradle
deleted file mode 100644
index 17fab8512f..0000000000
--- a/app/functions/widgets.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-// 悬浮控件：独立 app 和 launcher
-
-project.dependencies {
- if (Boolean.valueOf(RELEASE)) {
- implementation rootProject.ext.dependencies.mogomodulewidgets
- } else {
- implementation project(':modules:mogo-module-widgets')
- }
-}
\ No newline at end of file
diff --git a/app/productFlavors/f80x.gradle b/app/productFlavors/f80x.gradle
index f970b4cfd1..5326e8ad1c 100644
--- a/app/productFlavors/f80x.gradle
+++ b/app/productFlavors/f80x.gradle
@@ -1,6 +1,12 @@
project.android.productFlavors {
// f系列-分体机
f80x {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "arm64-v8a"
+ }
+ }
minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion
// 应用包名
diff --git a/app/productFlavors/f8Amap.gradle b/app/productFlavors/f8Amap.gradle
index e9a741fb95..5fa9369966 100644
--- a/app/productFlavors/f8Amap.gradle
+++ b/app/productFlavors/f8Amap.gradle
@@ -1,6 +1,12 @@
project.android.productFlavors {
// f系列-分体机-高德
f8Amap {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "armeabi-v7a"
+ }
+ }
minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion
// 应用包名
diff --git a/app/productFlavors/f8xx.gradle b/app/productFlavors/f8xx.gradle
index 1c98760fbb..8d82518154 100644
--- a/app/productFlavors/f8xx.gradle
+++ b/app/productFlavors/f8xx.gradle
@@ -1,6 +1,12 @@
project.android.productFlavors {
// f系列-分体机全系列，未细分
f8xx {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "arm64-v8a"
+ }
+ }
minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion
// 应用包名
diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle
index ca250c8b3e..cd10f3437b 100644
--- a/app/productFlavors/fPadLenovo.gradle
+++ b/app/productFlavors/fPadLenovo.gradle
@@ -1,6 +1,12 @@
project.android.productFlavors {
// 衡阳-联想Pad
fPadLenovo {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "arm64-v8a"
+ }
+ }
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
// 应用包名
diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle
index 9f09cb6836..c73590c8a2 100644
--- a/app/productFlavors/fPadLenovoOchBus.gradle
+++ b/app/productFlavors/fPadLenovoOchBus.gradle
@@ -1,6 +1,12 @@
project.android.productFlavors {
// 衡阳-联想Pad-网约车-小巴车
fPadLenovoOchBus {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "arm64-v8a"
+ }
+ }
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
// 应用包名
diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle
index a3e72e5219..3af432bc3a 100644
--- a/app/productFlavors/fPadLenovoOchTaxi.gradle
+++ b/app/productFlavors/fPadLenovoOchTaxi.gradle
@@ -2,6 +2,12 @@ project.android.productFlavors {
// 衡阳-联想Pad-网约车-出租车
fPadLenovoOchTaxi {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "arm64-v8a"
+ }
+ }
minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
targetSdkVersion rootProject.ext.android.targetSdkVersionPadLenovo
// 应用包名
diff --git a/app/productFlavors/fochbus.gradle b/app/productFlavors/fochbus.gradle
index 649d31a26b..823bd9cef5 100644
--- a/app/productFlavors/fochbus.gradle
+++ b/app/productFlavors/fochbus.gradle
@@ -1,6 +1,12 @@
project.android.productFlavors {
// f系列-网约车-小巴车
fochbus {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "arm64-v8a"
+ }
+ }
minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion
// 应用包名
diff --git a/app/productFlavors/fochtaxi.gradle b/app/productFlavors/fochtaxi.gradle
index 30f5349135..5c29f621c8 100644
--- a/app/productFlavors/fochtaxi.gradle
+++ b/app/productFlavors/fochtaxi.gradle
@@ -1,6 +1,12 @@
project.android.productFlavors {
// f系列-网约车-出租车
fochtaxi {
+ externalNativeBuild {
+ ndk {
+ // 设置支持的SO库架构
+ abiFilters "arm64-v8a"
+ }
+ }
minSdkVersion rootProject.ext.android.minSdkVersion
targetSdkVersion rootProject.ext.android.targetSdkVersion
// 应用包名
diff --git a/settings.gradle b/settings.gradle
index e5e117cf97..16050fd433 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -46,7 +46,6 @@ include ':modules:mogo-module-apps'
include ':modules:mogo-module-extensions'
include ':libraries:map-autonavi'
include ':modules:mogo-module-v2x'
-include ':main-extensions:mogo-module-main-independent'
include ':main-extensions:mogo-module-main-launcher'
include ':modules:mogo-module-push'
diff --git a/test/crashreport-noop/build.gradle b/test/crashreport-noop/build.gradle
index 3f1cdbbea3..04c8ec70cb 100644
--- a/test/crashreport-noop/build.gradle
+++ b/test/crashreport-noop/build.gradle
@@ -40,11 +40,11 @@ dependencies {
annotationProcessor rootProject.ext.dependencies.aroutercompiler
if (Boolean.valueOf(RELEASE)) {
- implementation rootProject.ext.dependencies.crashreport
+ api rootProject.ext.dependencies.crashreport
implementation rootProject.ext.dependencies.mogoutils
implementation rootProject.ext.dependencies.mogocommons
} else {
- implementation project(":test:crashreport")
+ api project(":test:crashreport")
implementation project(":foudations:mogo-utils")
implementation project(":foudations:mogo-commons")
}
diff --git a/test/crashreport-upgrade/build.gradle b/test/crashreport-upgrade/build.gradle
index e28fb2d408..595f9600d6 100644
--- a/test/crashreport-upgrade/build.gradle
+++ b/test/crashreport-upgrade/build.gradle
@@ -39,11 +39,11 @@ dependencies {
annotationProcessor rootProject.ext.dependencies.aroutercompiler
if (Boolean.valueOf(RELEASE)) {
- implementation rootProject.ext.dependencies.crashreport
+ api rootProject.ext.dependencies.crashreport
implementation rootProject.ext.dependencies.mogoutils
implementation rootProject.ext.dependencies.mogocommons
} else {
- implementation project(":test:crashreport")
+ api project(":test:crashreport")
implementation project(":foudations:mogo-utils")
implementation project(":foudations:mogo-commons")
}