diff --git a/core/function-impl/mogo-core-function-main/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle
index bc53666dd2..ae19924056 100644
--- a/core/function-impl/mogo-core-function-main/build.gradle
+++ b/core/function-impl/mogo-core-function-main/build.gradle
@@ -67,13 +67,14 @@ dependencies {
api rootProject.ext.dependencies.mogoaicloudservicesdk
api rootProject.ext.dependencies.mogocommons
api rootProject.ext.dependencies.modulecommon
+ api rootProject.ext.dependencies.mogoserviceapi
+ api rootProject.ext.dependencies.moduleservice
api rootProject.ext.dependencies.mogoservice
api rootProject.ext.dependencies.callchat
api rootProject.ext.dependencies.callchatprovider
api rootProject.ext.dependencies.mapcustom
api rootProject.ext.dependencies.crashreportupgrade
// api rootProject.ext.dependencies.crashreportbugly
- api rootProject.ext.dependencies.moduleservice
api rootProject.ext.dependencies.mogo_core_data
api rootProject.ext.dependencies.mogo_core_utils
@@ -87,12 +88,16 @@ dependencies {
api rootProject.ext.dependencies.mogo_core_function_v2x
api rootProject.ext.dependencies.mogo_core_function_monitoring
api rootProject.ext.dependencies.mogo_core_function_devatools
+ api rootProject.ext.dependencies.mogo_core_function_carcorder
+ api rootProject.ext.dependencies.mogo_core_function_call
- api rootProject.ext.dependencies.modulemain
} else {
api project(':foudations:mogo-aicloud-services-sdk')
api project(':foudations:mogo-commons')
api project(':modules:mogo-module-common')
+ api project(':services:mogo-service-api')
+ api project(':services:mogo-service')
+
api project(':modules:mogo-module-service')
api project(':modules:mogo-module-carchatting')
api project(':modules:mogo-module-carchattingprovider')
@@ -100,7 +105,6 @@ dependencies {
api project(':test:crashreport-upgrade')
// api project(':test:crashreport-bugly')
api project(':test:crashreport-apmbyte')
- api project(':modules:mogo-module-service')
api project(':core:mogo-core-data')
api project(':core:mogo-core-utils')
@@ -114,8 +118,9 @@ dependencies {
api project(':core:function-impl:mogo-core-function-v2x')
api project(':core:function-impl:mogo-core-function-monitoring')
api project(':core:function-impl:mogo-core-function-devatools')
+ api project(':core:function-impl:mogo-core-function-carcorder')
+ api project(':core:mogo-core-function-call')
- api project(":modules:mogo-module-main")
}
}
diff --git a/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
index c765144bfa..7fc3ee0a60 100644
--- a/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
+
+ 350px
+ 8px
+ 352px
+ 370px
+ 32px
+ 140.5px
+ 18px
+ 20px
+ 10px
+ 144px
+ 352px
+
+ 320px
+ 319px
+
+ 110px
+ 6px
+ 15px
+ 460px
+ 444px
+ 0px
+ 350px
+ 10px
+ 16px
+ 658px
+ 8px
+ 2px
+ 2px
+ 1920px
+
+ 0px
+
+ 0px
+ 0px
+ 6px
+ 6px
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml b/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
similarity index 95%
rename from modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
rename to core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 54b1d65a55..2a0153c05a 100644
--- a/modules/mogo-module-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -1,5 +1,7 @@
+ 800px
+
350px
10px
diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml
index 25247f638b..f40a0f3b9e 100644
--- a/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml
@@ -1,5 +1,37 @@
- 0px
800px
+
+ 350px
+ 10px
+ 660px
+ 690px
+ 60px
+ 211px
+ 30px
+ 30px
+ 15px
+ 270px
+ 660px
+ 600px
+ 599px
+
+ 200px
+ 20px
+ 30px
+ 830px
+ 800px
+ 0px
+ 20px
+ 30px
+
+ 340px
+ 1313px
+ 20px
+ 20px
+
+ 20px
+ 18px
+ 18px
+ 18px
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values/colors.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml
similarity index 100%
rename from modules/mogo-module-main/src/main/res/values/colors.xml
rename to core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml
diff --git a/core/function-impl/mogo-core-function-main/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/dimens.xml
index 25247f638b..71aef0c5ce 100644
--- a/core/function-impl/mogo-core-function-main/src/main/res/values/dimens.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/res/values/dimens.xml
@@ -2,4 +2,40 @@
0px
800px
+
+ 350px
+ 8px
+ 352px
+ 370px
+ 32px
+ 140.5px
+ 18px
+ 20px
+ 10px
+ 144px
+ 352px
+
+ 320px
+ 319px
+
+ 110px
+ 6px
+ 15px
+ 460px
+ 444px
+ 350px
+ 10px
+ 16px
+ 658px
+ 8px
+ 2px
+ 1920px
+ 0px
+
+ 2px
+ 2px
+ 2px
+ 4px
+ 8px
+
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values/strings.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/strings.xml
similarity index 100%
rename from modules/mogo-module-main/src/main/res/values/strings.xml
rename to core/function-impl/mogo-core-function-main/src/main/res/values/strings.xml
diff --git a/modules/mogo-module-main/src/main/res/values/styles.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml
similarity index 100%
rename from modules/mogo-module-main/src/main/res/values/styles.xml
rename to core/function-impl/mogo-core-function-main/src/main/res/values/styles.xml
diff --git a/modules.txt b/modules.txt
index 57154e1f71..6286ffa46c 100644
--- a/modules.txt
+++ b/modules.txt
@@ -27,7 +27,6 @@
:core:function-impl:mogo-core-function-check
:services:mogo-service
:core:function-impl:mogo-core-function-smp
-:modules:mogo-module-main
:core:function-impl:mogo-core-function-autopilot
:core:function-impl:mogo-core-function-hmi
:core:function-impl:mogo-core-function-map
diff --git a/modules/mogo-module-main/.gitignore b/modules/mogo-module-main/.gitignore
deleted file mode 100644
index 796b96d1c4..0000000000
--- a/modules/mogo-module-main/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/modules/mogo-module-main/README.md b/modules/mogo-module-main/README.md
deleted file mode 100644
index 2b77272bbe..0000000000
--- a/modules/mogo-module-main/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# 主模块
-
-## 子模块加载管理
-
-## 加载地图
-
-## 事件分发
-
-## service 后台服务
-
-开启定位、加载基础服务模块:v2x、刷新策略、事件上报模块、初始化 ADAS 服务
-
-## 应用内浮窗管理:车聊聊、音乐等
-
-## scheme 跳转管理
-
diff --git a/modules/mogo-module-main/build.gradle b/modules/mogo-module-main/build.gradle
deleted file mode 100644
index b209b14507..0000000000
--- a/modules/mogo-module-main/build.gradle
+++ /dev/null
@@ -1,81 +0,0 @@
-plugins {
- id 'com.android.library'
- id 'kotlin-android'
- id 'kotlin-android-extensions'
- id 'kotlin-kapt'
- id 'com.alibaba.arouter'
-}
-
-android {
- compileSdkVersion rootProject.ext.android.compileSdkVersion
- // buildToolsVersion rootProject.ext.android.buildToolsVersion
- defaultConfig {
- minSdkVersion rootProject.ext.android.minSdkVersion
- targetSdkVersion rootProject.ext.android.targetSdkVersion
- versionCode Integer.valueOf(VERSION_CODE)
- versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles 'consumer-rules.pro'
-
- //ARouter apt 参数
- kapt {
- useBuildCache = false
- arguments {
- arg("AROUTER_MODULE_NAME", project.getName())
- }
- }
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
-}
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar'])
-
- implementation rootProject.ext.dependencies.androidxappcompat
- implementation rootProject.ext.dependencies.androidxconstraintlayout
-
- implementation rootProject.ext.dependencies.arouter
- kapt rootProject.ext.dependencies.aroutercompiler
-
- compileOnly rootProject.ext.dependencies.adasapi
- compileOnly rootProject.ext.dependencies.adasconfigapi
- if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
- api rootProject.ext.dependencies.mogocommons
- api rootProject.ext.dependencies.modulecommon
- api rootProject.ext.dependencies.mogoserviceapi
- api rootProject.ext.dependencies.moduleservice
- implementation rootProject.ext.dependencies.callchatprovider
-
- implementation rootProject.ext.dependencies.mogo_core_utils
- implementation rootProject.ext.dependencies.mogo_core_data
- implementation rootProject.ext.dependencies.mogo_core_function_call
- implementation rootProject.ext.dependencies.mogo_core_function_carcorder
- } else {
- api project(":foudations:mogo-commons")
- api project(':modules:mogo-module-common')
- api project(':services:mogo-service-api')
- api project(':services:mogo-service')
- implementation project(':modules:mogo-module-carchattingprovider')
-
- implementation project(':core:mogo-core-utils')
- implementation project(':core:mogo-core-data')
- implementation project(':core:mogo-core-function-call')
- implementation project(':core:function-impl:mogo-core-function-carcorder')
-
- }
-}
-
-apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-main/consumer-rules.pro b/modules/mogo-module-main/consumer-rules.pro
deleted file mode 100644
index 3d6a2e9a4e..0000000000
--- a/modules/mogo-module-main/consumer-rules.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-#-----MainModule-----
--keep class com.mogo.module.main.constants.*{*;}
--keep class com.mogo.module.main.service.MogoMainService{*;}
\ No newline at end of file
diff --git a/modules/mogo-module-main/gradle.properties b/modules/mogo-module-main/gradle.properties
deleted file mode 100644
index be02d870b1..0000000000
--- a/modules/mogo-module-main/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-main
-VERSION_CODE=1
diff --git a/modules/mogo-module-main/proguard-rules.pro b/modules/mogo-module-main/proguard-rules.pro
deleted file mode 100644
index 2e4c54a15f..0000000000
--- a/modules/mogo-module-main/proguard-rules.pro
+++ /dev/null
@@ -1,29 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-
-#-----MainModule-----
--keep class com.mogo.module.main.cards.CardIntroduceConfig.*{*;}
--keep class com.mogo.module.main.cards.MogoModulesHandler
--keep class com.mogo.module.main.constants.**{*;}
--keep class com.mogo.module.main.livedata.**{*;}
--keep class com.mogo.module.main.service.MogoMainService
--keep class com.mogo.module.main.windowview.IWindowViewHandler
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/AndroidManifest.xml b/modules/mogo-module-main/src/main/AndroidManifest.xml
deleted file mode 100644
index 669e61422b..0000000000
--- a/modules/mogo-module-main/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/modules/mogo-module-main/src/main/module-configs.json b/modules/mogo-module-main/src/main/module-configs.json
deleted file mode 100644
index 377583c00e..0000000000
--- a/modules/mogo-module-main/src/main/module-configs.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "cards": [
- {
- "name": "",
- "path": ""
- }
- ]
-}
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi-1920x1000/module_main_launcher_bg.webp b/modules/mogo-module-main/src/main/res/drawable-xhdpi-1920x1000/module_main_launcher_bg.webp
deleted file mode 100644
index d39b3abe55..0000000000
Binary files a/modules/mogo-module-main/src/main/res/drawable-xhdpi-1920x1000/module_main_launcher_bg.webp and /dev/null differ
diff --git a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
deleted file mode 100644
index 8849f14d0d..0000000000
--- a/modules/mogo-module-main/src/main/res/values-mdpi/dimens.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- 350px
- 8px
- 352px
- 370px
- 32px
- 140.5px
- 18px
- 20px
- 10px
- 144px
- 352px
-
- 320px
- 319px
-
- 110px
- 6px
- 15px
- 460px
- 444px
- 0px
- 350px
- 10px
- 16px
- 658px
- 8px
- 2px
- 2px
- 1920px
-
- 0px
-
- 0px
- 0px
- 6px
- 6px
-
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
deleted file mode 100644
index 43a56ac2bf..0000000000
--- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
- 350px
- 10px
- 660px
- 690px
- 60px
- 211px
- 30px
- 30px
- 15px
- 270px
- 660px
- 600px
- 599px
-
- 200px
- 20px
- 30px
- 830px
- 800px
- 0px
- 20px
- 30px
-
- 340px
- 1313px
- 20px
- 20px
-
- 20px
- 18px
- 18px
- 18px
-
-
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml
deleted file mode 100644
index a985fd57d2..0000000000
--- a/modules/mogo-module-main/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- 350px
- 8px
- 352px
- 370px
- 32px
- 140.5px
- 18px
- 20px
- 10px
- 144px
- 352px
-
- 320px
- 319px
-
- 110px
- 6px
- 15px
- 460px
- 444px
- 0px
- 350px
- 10px
- 16px
- 658px
- 8px
- 2px
- 1920px
- 0px
-
- 2px
- 2px
- 2px
- 4px
- 8px
-
-
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 2ec59e17d2..3186ff09e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -61,7 +61,6 @@ include ':libraries:mogo-adas'
// OLD业务模块
include ':modules:mogo-module-common'
-include ':modules:mogo-module-main'
include ':modules:mogo-module-service'
include ':modules:mogo-module-carchatting'
include ':modules:mogo-module-carchattingprovider'