diff --git a/app/build.gradle b/app/build.gradle
index bf6389f181..0aca16d4d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -71,9 +71,6 @@ android {
main {
manifest.srcFile 'src/main/AndroidManifest.xml'
}
- launcher {
- manifest.srcFile 'src/launcher/AndroidManifest.xml'
- }
f8xxLauncherOnlineRelease {
manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml'
}
diff --git a/app/functions/abiFilters.gradle b/app/functions/abiFilters.gradle
index 50a3b96168..231565ac78 100644
--- a/app/functions/abiFilters.gradle
+++ b/app/functions/abiFilters.gradle
@@ -64,15 +64,6 @@ project.android.productFlavors {
}
}
}
- // f系列-分体机
- phone {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "arm64-v8a"
- }
- }
- }
// f系列-分体机-高德
f8Amap {
externalNativeBuild {
@@ -82,13 +73,4 @@ project.android.productFlavors {
}
}
}
- // 比亚迪
- bydauto {
- externalNativeBuild {
- ndk {
- // 设置支持的SO库架构
- abiFilters "armeabi-v7a"
- }
- }
- }
}
\ No newline at end of file
diff --git a/app/functions/aicloudservices.gradle b/app/functions/aicloudservices.gradle
index b27edb241e..719b88065c 100644
--- a/app/functions/aicloudservices.gradle
+++ b/app/functions/aicloudservices.gradle
@@ -1,9 +1,6 @@
// 基础服务：仅比亚迪渠道用sdk方式实现，其他都基于apk基础服务
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
- bydautoImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
- phoneImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
-
f8xxImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
f80xImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
f8AmapImplementation rootProject.ext.dependencies.mogoaicloudserviceapk
@@ -14,9 +11,6 @@ project.dependencies {
fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogoaicloudservicesdk
} else {
- bydautoImplementation project(':foudations:mogo-aicloud-services-sdk')
- phoneImplementation project(':foudations:mogo-aicloud-services-sdk')
-
f8xxImplementation project(':foudations:mogo-aicloud-services-apk')
f80xImplementation project(':foudations:mogo-aicloud-services-apk')
f8AmapImplementation project(':foudations:mogo-aicloud-services-apk')
diff --git a/app/functions/basedmap.gradle b/app/functions/basedmap.gradle
index 4ad704ff3e..0635a537fa 100644
--- a/app/functions/basedmap.gradle
+++ b/app/functions/basedmap.gradle
@@ -6,14 +6,12 @@ project.dependencies {
f80xImplementation rootProject.ext.dependencies.mapcustom
fochtaxiImplementation rootProject.ext.dependencies.mapcustom
fochbusImplementation rootProject.ext.dependencies.mapcustom
- phoneImplementation rootProject.ext.dependencies.mapcustom
fPadLenovoImplementation rootProject.ext.dependencies.mapcustom
fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mapcustom
fPadLenovoOchBusImplementation rootProject.ext.dependencies.mapcustom
f8AmapImplementation rootProject.ext.dependencies.mapamap
- bydautoImplementation rootProject.ext.dependencies.mapamap
} else {
f8xxImplementation project(':libraries:map-custom')
@@ -25,10 +23,6 @@ project.dependencies {
fPadLenovoOchTaxiImplementation project(':libraries:map-custom')
fPadLenovoOchBusImplementation project(':libraries:map-custom')
- phoneImplementation project(':libraries:map-custom')
-
f8AmapImplementation project(':libraries:map-amap')
- bydautoImplementation project(':libraries:map-amap')
-
}
}
\ No newline at end of file
diff --git a/app/functions/baseservices.gradle b/app/functions/baseservices.gradle
index 23d545639c..7cafe88e90 100644
--- a/app/functions/baseservices.gradle
+++ b/app/functions/baseservices.gradle
@@ -15,9 +15,6 @@ project.dependencies {
fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogobaseserviceapk
fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogobaseserviceapk
} else {
- bydautoImplementation project(':foudations:mogo-base-services-sdk')
- phoneImplementation project(':foudations:mogo-base-services-sdk')
-
f8xxImplementation project(':foudations:mogo-base-services-apk')
f80xImplementation project(':foudations:mogo-base-services-apk')
f8AmapImplementation project(':foudations:mogo-base-services-apk')
diff --git a/app/functions/bizguide.gradle b/app/functions/bizguide.gradle
index 6b621b0750..50f4a7bdfe 100644
--- a/app/functions/bizguide.gradle
+++ b/app/functions/bizguide.gradle
@@ -2,8 +2,6 @@
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
- bydautoImplementation rootProject.ext.dependencies.mogomoduleguide
- phoneImplementation rootProject.ext.dependencies.mogomoduleguide
f8xxImplementation rootProject.ext.dependencies.mogomoduleguide
f80xImplementation rootProject.ext.dependencies.mogomoduleguide
f8AmapImplementation rootProject.ext.dependencies.mogomoduleguide
@@ -15,9 +13,6 @@ project.dependencies {
fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogomoduleguide
fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogomoduleguide
} else {
- bydautoImplementation project(':modules:mogo-module-guide')
- phoneImplementation project(':modules:mogo-module-guide')
-
f8xxImplementation project(':modules:mogo-module-guide')
f80xImplementation project(':modules:mogo-module-guide')
f8AmapImplementation project(':modules:mogo-module-guide')
diff --git a/app/functions/crashreport.gradle b/app/functions/crashreport.gradle
index 2462fb32a3..da0ebfd96a 100644
--- a/app/functions/crashreport.gradle
+++ b/app/functions/crashreport.gradle
@@ -1,5 +1,4 @@
// bugly 上报，目前仅在debug编译下加载bugly
-
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
implementation rootProject.ext.dependencies.crashreport
diff --git a/app/functions/leftpanel.gradle b/app/functions/leftpanel.gradle
index c8e07a3939..15a7509e9b 100644
--- a/app/functions/leftpanel.gradle
+++ b/app/functions/leftpanel.gradle
@@ -2,9 +2,6 @@
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
- bydautoImplementation rootProject.ext.dependencies.moduleleftpanel
- phoneImplementation rootProject.ext.dependencies.moduleleftpanelnoop
-
f8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
f80xImplementation rootProject.ext.dependencies.moduleleftpanelnoop
f8AmapImplementation rootProject.ext.dependencies.moduleleftpanelnoop
@@ -17,9 +14,6 @@ project.dependencies {
fPadLenovoOchBusImplementation rootProject.ext.dependencies.moduleleftpanelnoop
} else {
- bydautoImplementation project(':modules:mogo-module-left-panel')
- phoneImplementation project(':modules:mogo-module-left-panel-noop')
-
f8xxImplementation project(':modules:mogo-module-left-panel-noop')
f80xImplementation project(':modules:mogo-module-left-panel-noop')
f8AmapImplementation project(':modules:mogo-module-left-panel-noop')
diff --git a/app/functions/mediaui.gradle b/app/functions/mediaui.gradle
deleted file mode 100644
index fab92e7f71..0000000000
--- a/app/functions/mediaui.gradle
+++ /dev/null
@@ -1,9 +0,0 @@
-// 音乐播放模块
-
-project.dependencies {
- if (Boolean.valueOf(RELEASE)) {
- launcherImplementation rootProject.ext.dependencies.modulemedia
- } else {
- launcherImplementation project(':modules:mogo-module-media')
- }
-}
\ No newline at end of file
diff --git a/app/functions/och.gradle b/app/functions/och.gradle
index 255ba426d5..8738eeab06 100644
--- a/app/functions/och.gradle
+++ b/app/functions/och.gradle
@@ -1,9 +1,6 @@
// 网约车服务：仅小巴车、出租车渠道用
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
- bydautoImplementation rootProject.ext.dependencies.mogoochnoop
- phoneImplementation rootProject.ext.dependencies.mogoochnoop
-
f8xxImplementation rootProject.ext.dependencies.mogoochnoop
f80xImplementation rootProject.ext.dependencies.mogoochnoop
f8AmapImplementation rootProject.ext.dependencies.mogoochnoop
@@ -15,9 +12,6 @@ project.dependencies {
fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.mogoochtaxi
fPadLenovoOchBusImplementation rootProject.ext.dependencies.mogoochbus
} else {
- bydautoImplementation project(':OCH:mogo-och-noop')
- phoneImplementation project(':OCH:mogo-och-noop')
-
f8xxImplementation project(':OCH:mogo-och-noop')
f80xImplementation project(':OCH:mogo-och-noop')
f8AmapImplementation project(':OCH:mogo-och-noop')
diff --git a/app/functions/perform.gradle b/app/functions/perform.gradle
index 97017f2a5f..2e8bfa149b 100644
--- a/app/functions/perform.gradle
+++ b/app/functions/perform.gradle
@@ -3,13 +3,11 @@
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
launcherImplementation rootProject.ext.dependencies.modulemainlauncher
- independentImplementation rootProject.ext.dependencies.modulemainindependent
// 仅launcher需要引入该模块
launcherImplementation rootProject.ext.dependencies.moduleapps
} else {
launcherImplementation project(':main-extensions:mogo-module-main-launcher')
- independentImplementation project(':main-extensions:mogo-module-main-independent')
// 仅launcher需要引入该模块
launcherImplementation project(':modules:mogo-module-apps')
diff --git a/app/functions/skin.gradle b/app/functions/skin.gradle
index 4c2f5725e7..85e7a38480 100644
--- a/app/functions/skin.gradle
+++ b/app/functions/skin.gradle
@@ -1,7 +1,5 @@
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
- bydautoImplementation rootProject.ext.dependencies.skinsupportnoop
- phoneImplementation rootProject.ext.dependencies.skinsupportimpl
f8xxImplementation rootProject.ext.dependencies.skinsupportimpl
f80xImplementation rootProject.ext.dependencies.skinsupportimpl
@@ -14,9 +12,6 @@ project.dependencies {
fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportimpl
fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportimpl
-
- phoneImplementation rootProject.ext.dependencies.skinsupportlight
-
f8xxImplementation rootProject.ext.dependencies.skinsupportlight
f80xImplementation rootProject.ext.dependencies.skinsupportlight
f8AmapImplementation rootProject.ext.dependencies.skinsupportlight
@@ -28,10 +23,6 @@ project.dependencies {
fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.skinsupportlight
fPadLenovoOchBusImplementation rootProject.ext.dependencies.skinsupportlight
} else {
-
- bydautoImplementation project(':skin:mogo-skin-support-noop')
- phoneImplementation project(':skin:mogo-skin-support-impl')
-
f8xxImplementation project(':skin:mogo-skin-support-impl')
f80xImplementation project(':skin:mogo-skin-support-impl')
f8AmapImplementation project(':skin:mogo-skin-support-impl')
@@ -43,9 +34,6 @@ project.dependencies {
fPadLenovoOchTaxiImplementation project(':skin:mogo-skin-support-impl')
fPadLenovoOchBusImplementation project(':skin:mogo-skin-support-impl')
-
- phoneImplementation project(':skin:mogo-skin-light')
-
f8xxImplementation project(':skin:mogo-skin-light')
f80xImplementation project(':skin:mogo-skin-light')
f8AmapImplementation project(':skin:mogo-skin-light')
diff --git a/app/functions/socketpush.gradle b/app/functions/socketpush.gradle
index b42be11b59..e3e7833d1b 100644
--- a/app/functions/socketpush.gradle
+++ b/app/functions/socketpush.gradle
@@ -4,10 +4,8 @@ project.dependencies {
if (Boolean.valueOf(RELEASE)) {
implementation rootProject.ext.dependencies.modulepushbase
launcherImplementation rootProject.ext.dependencies.modulepush
- independentImplementation rootProject.ext.dependencies.modulepushnoop
} else {
implementation project(":modules:mogo-module-push-base")
launcherImplementation project(":modules:mogo-module-push")
- independentImplementation project(":modules:mogo-module-push-noop")
}
}
\ No newline at end of file
diff --git a/app/functions/tts.gradle b/app/functions/tts.gradle
index bc6ed75bd7..8c7b00177e 100644
--- a/app/functions/tts.gradle
+++ b/app/functions/tts.gradle
@@ -1,8 +1,5 @@
project.dependencies {
if (Boolean.valueOf(RELEASE)) {
- bydautoImplementation rootProject.ext.dependencies.ttsdi
- phoneImplementation rootProject.ext.dependencies.ttszhi
-
f8xxImplementation rootProject.ext.dependencies.ttszhi
f80xImplementation rootProject.ext.dependencies.ttszhi
f8AmapImplementation rootProject.ext.dependencies.ttszhi
@@ -14,9 +11,6 @@ project.dependencies {
fPadLenovoOchTaxiImplementation rootProject.ext.dependencies.ttspad
fPadLenovoOchBusImplementation rootProject.ext.dependencies.ttspad
} else {
- bydautoImplementation project(':tts:tts-di')
- phoneImplementation project(':tts:tts-zhi')
-
f8xxImplementation project(':tts:tts-zhi')
f80xImplementation project(':tts:tts-zhi')
f8AmapImplementation project(':tts:tts-zhi')
diff --git a/app/productFlavors/bydauto.gradle b/app/productFlavors/bydauto.gradle
deleted file mode 100644
index d0b1dc91e3..0000000000
--- a/app/productFlavors/bydauto.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-project.android.productFlavors {
- // 比亚迪
- bydauto {
- minSdkVersion rootProject.ext.android.minSdkVersion
- targetSdkVersion rootProject.ext.android.targetSdkVersion
- // 应用包名
- applicationId rootProject.ext.android.bydautoIndependentApplicationId
- dimension "product"
- buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
- // 车机类型，主要用于区分自研车机还是别人家的车机，其他车机，比亚迪定为1
- buildConfigField 'int', 'CAR_MACHINE_TYPE', '1'
- buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
- manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.bydautoIndependentApiValue, CHANNEL_VALUE: "bydauto"]
- // 是否使用高德sdk自定义导航
- buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
- // 是否支持换肤
- buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
- // 是否支持查询导航目的地车友
- buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'false'
- // 是否支持桌面卡片刷新
- buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
- // 是否基于地图
- buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
- // 是否加载引导模块
- buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
- // 分享时是否隐藏 adas
- buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
- // 是否需要实时上报坐标
- buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'false'
- // 是否需要使用工控机的rtk定位
- buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false'
- // 是否需要悬浮窗权限申请
- buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true'
- // GPS数据提供源： 0-Android系统，1-工控机，2-OBU
- buildConfigField 'int', 'GPS_PROVIDER', "1"
- }
-}
\ No newline at end of file
diff --git a/app/productFlavors/phone.gradle b/app/productFlavors/phone.gradle
deleted file mode 100644
index 7694872acc..0000000000
--- a/app/productFlavors/phone.gradle
+++ /dev/null
@@ -1,35 +0,0 @@
-project.android.productFlavors {
- // f系列-分体机
- phone {
- // 应用包名
- applicationId rootProject.ext.android.fLauncherApplicationId
- dimension "product"
- buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
- // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
- buildConfigField 'int', 'CAR_MACHINE_TYPE', '1'
- buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
- manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "phone"]
- // 是否使用高德sdk自定义导航
- buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
- // 是否支持换肤
- buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
- // 是否支持查询导航目的地车友
- buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
- // 是否支持桌面卡片刷新
- buildConfigField 'boolean', 'IS_SUPPORT_LAUNCHER_CARD_REFRESH_STRATEGY', 'false'
- // 是否基于地图
- buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
- // 是否加载引导模块
- buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
- // 分享时是否隐藏 adas
- buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
- // 是否需要实时上报坐标
- buildConfigField 'boolean', 'IS_NEED_UPLOAD_COORDINATES_IN_TIME', 'true'
- // 是否需要使用工控机的rtk定位
- buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true'
- // 是否需要悬浮窗权限申请
- buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true'
- // GPS数据提供源： 0-Android系统，1-工控机，2-OBU
- buildConfigField 'int', 'GPS_PROVIDER', "1"
- }
-}
\ No newline at end of file
diff --git a/app/src/e8xx/AndroidManifest.xml b/app/src/e8xx/AndroidManifest.xml
deleted file mode 100644
index 01afff1292..0000000000
--- a/app/src/e8xx/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/em4/AndroidManifest.xml b/app/src/em4/AndroidManifest.xml
deleted file mode 100644
index d755054676..0000000000
--- a/app/src/em4/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/independent/AndroidManifest.xml b/app/src/independent/AndroidManifest.xml
deleted file mode 100644
index 69211733d6..0000000000
--- a/app/src/independent/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/launcher/AndroidManifest.xml b/app/src/launcher/AndroidManifest.xml
deleted file mode 100644
index cdf501d602..0000000000
--- a/app/src/launcher/AndroidManifest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file