From 967ee3b48e5a581dee4870d9be2983507385e1df Mon Sep 17 00:00:00 2001
From: donghongyu <donghongyu@zhidaoauto.com>
Date: Mon, 15 Nov 2021 12:09:20 +0800
Subject: [PATCH] =?UTF-8?q?[Add]=E8=B0=83=E6=95=B4=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E4=B8=BB=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
---
 .idea/gradle.xml                                            | 6 ++----
 app/build.gradle                                            | 3 ++-
 config.gradle                                               | 1 +
 .../function-impl/mogo-core-function-main}/.gitignore       | 0
 .../function-impl/mogo-core-function-main}/build.gradle     | 0
 .../mogo-core-function-main}/consumer-rules.pro             | 0
 .../function-impl/mogo-core-function-main/gradle.properties | 3 +++
 .../mogo-core-function-main}/proguard-rules.pro             | 0
 .../mogo-core-function-main}/src/main/AndroidManifest.xml   | 5 +++--
 .../eagle/core/function/main}/MainLauncherActivity.java     | 2 +-
 .../src/main/res/values-ldpi/dimens.xml                     | 0
 .../src/main/res/values-mdpi/dimens.xml                     | 0
 .../src/main/res/values-xhdpi/dimens.xml                    | 0
 .../mogo-core-function-main}/src/main/res/values/dimens.xml | 0
 gradle.properties                                           | 1 +
 main-extensions/mogo-module-main-launcher/gradle.properties | 3 ---
 modules-back.txt                                            | 1 -
 modules.txt                                                 | 2 +-
 settings.gradle                                             | 5 ++---
 19 files changed, 16 insertions(+), 16 deletions(-)
 rename {main-extensions/mogo-module-main-launcher => core/function-impl/mogo-core-function-main}/.gitignore (100%)
 rename {main-extensions/mogo-module-main-launcher => core/function-impl/mogo-core-function-main}/build.gradle (100%)
 rename {main-extensions/mogo-module-main-launcher => core/function-impl/mogo-core-function-main}/consumer-rules.pro (100%)
 create mode 100644 core/function-impl/mogo-core-function-main/gradle.properties
 rename {main-extensions/mogo-module-main-launcher => core/function-impl/mogo-core-function-main}/proguard-rules.pro (100%)
 rename {main-extensions/mogo-module-main-launcher => core/function-impl/mogo-core-function-main}/src/main/AndroidManifest.xml (95%)
 rename {main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher => core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main}/MainLauncherActivity.java (99%)
 rename {main-extensions/mogo-module-main-launcher => core/function-impl/mogo-core-function-main}/src/main/res/values-ldpi/dimens.xml (100%)
 rename {main-extensions/mogo-module-main-launcher => core/function-impl/mogo-core-function-main}/src/main/res/values-mdpi/dimens.xml (100%)
 rename {main-extensions/mogo-module-main-launcher => core/function-impl/mogo-core-function-main}/src/main/res/values-xhdpi/dimens.xml (100%)
 rename {main-extensions/mogo-module-main-launcher => core/function-impl/mogo-core-function-main}/src/main/res/values/dimens.xml (100%)
 delete mode 100644 main-extensions/mogo-module-main-launcher/gradle.properties

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 62f8f6fabb..3dda1fe044 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="1.8" />
@@ -22,6 +22,7 @@
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-autopilot" />
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-check" />
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-hmi" />
+            <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-main" />
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-map" />
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-monitoring" />
             <option value="$PROJECT_DIR$/core/function-impl/mogo-core-function-notice" />
@@ -43,8 +44,6 @@
             <option value="$PROJECT_DIR$/libraries/map-custom" />
             <option value="$PROJECT_DIR$/libraries/mogo-map" />
             <option value="$PROJECT_DIR$/libraries/mogo-map-api" />
-            <option value="$PROJECT_DIR$/main-extensions" />
-            <option value="$PROJECT_DIR$/main-extensions/mogo-module-main-launcher" />
             <option value="$PROJECT_DIR$/modules" />
             <option value="$PROJECT_DIR$/modules/mogo-module-adas" />
             <option value="$PROJECT_DIR$/modules/mogo-module-apps" />
@@ -83,7 +82,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 2380acaa01..e83aa23e4c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -187,6 +187,7 @@ dependencies {
         implementation rootProject.ext.dependencies.crashreportbugly
 
         implementation rootProject.ext.dependencies.mogo_core_data
+        implementation rootProject.ext.dependencies.mogo_core_function_main
         implementation rootProject.ext.dependencies.mogo_core_function_obu_mogo
         implementation rootProject.ext.dependencies.mogo_core_function_smp
         implementation rootProject.ext.dependencies.mogo_core_function_hmi
@@ -210,7 +211,6 @@ dependencies {
         implementation project(':modules:mogo-module-widgets')
         implementation project(':modules:mogo-module-adas')
         implementation project(':modules:mogo-module-back')
-        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")
@@ -221,6 +221,7 @@ dependencies {
         implementation project(':test:crashreport-bugly')
 
         implementation project(':core:mogo-core-data')
+        implementation project(':core:function-impl:mogo-core-function-main')
         implementation project(':core:function-impl:mogo-core-function-obu-mogo')
         implementation project(':core:function-impl:mogo-core-function-smp')
         implementation project(':core:function-impl:mogo-core-function-hmi')
diff --git a/config.gradle b/config.gradle
index 1521415974..5e2395b4d1 100644
--- a/config.gradle
+++ b/config.gradle
@@ -225,6 +225,7 @@ ext {
             mogo_core_function_check     : "com.mogo.eagle.core.function.impl:check:${MOGO_CORE_FUNCTION_CHECK_VERSION}",
             mogo_core_function_hmi       : "com.mogo.eagle.core.function.impl:hmi:${MOGO_CORE_FUNCTION_HMI_VERSION}",
             mogo_core_function_map       : "com.mogo.eagle.core.function.impl:map:${MOGO_CORE_FUNCTION_MAP_VERSION}",
+            mogo_core_function_main      : "com.mogo.eagle.core.function.impl:main:${MOGO_CORE_FUNCTION_MAIN_VERSION}",
             mogo_core_function_monitoring: "com.mogo.eagle.core.function.impl:monitoring:${MOGO_CORE_FUNCTION_MONITORING_VERSION}",
             mogo_core_function_notice    : "com.mogo.eagle.core.function.impl:notice:${MOGO_CORE_FUNCTION_NOTICE_VERSION}",
             mogo_core_function_obu_mogo  : "com.mogo.eagle.core.function.impl:obu-mogo:${MOGO_CORE_FUNCTION_OBU_MOGO_VERSION}",
diff --git a/main-extensions/mogo-module-main-launcher/.gitignore b/core/function-impl/mogo-core-function-main/.gitignore
similarity index 100%
rename from main-extensions/mogo-module-main-launcher/.gitignore
rename to core/function-impl/mogo-core-function-main/.gitignore
diff --git a/main-extensions/mogo-module-main-launcher/build.gradle b/core/function-impl/mogo-core-function-main/build.gradle
similarity index 100%
rename from main-extensions/mogo-module-main-launcher/build.gradle
rename to core/function-impl/mogo-core-function-main/build.gradle
diff --git a/main-extensions/mogo-module-main-launcher/consumer-rules.pro b/core/function-impl/mogo-core-function-main/consumer-rules.pro
similarity index 100%
rename from main-extensions/mogo-module-main-launcher/consumer-rules.pro
rename to core/function-impl/mogo-core-function-main/consumer-rules.pro
diff --git a/core/function-impl/mogo-core-function-main/gradle.properties b/core/function-impl/mogo-core-function-main/gradle.properties
new file mode 100644
index 0000000000..2a2587d9c2
--- /dev/null
+++ b/core/function-impl/mogo-core-function-main/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.eagle.core.function.impl
+POM_ARTIFACT_ID=main
+VERSION_CODE=1
diff --git a/main-extensions/mogo-module-main-launcher/proguard-rules.pro b/core/function-impl/mogo-core-function-main/proguard-rules.pro
similarity index 100%
rename from main-extensions/mogo-module-main-launcher/proguard-rules.pro
rename to core/function-impl/mogo-core-function-main/proguard-rules.pro
diff --git a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
similarity index 95%
rename from main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
rename to core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
index a321888931..cec93e9e67 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml
+++ b/core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml
@@ -1,12 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zhidao.mogo.module.main.launcher">
+    package="com.mogo.eagle.core.function.main">
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    
+
     <application>
         <activity
             android:name=".MainLauncherActivity"
diff --git a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
similarity index 99%
rename from main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
rename to core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
index e3d7ed25a3..282405f91d 100644
--- a/main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java
+++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java
@@ -1,4 +1,4 @@
-package com.zhidao.mogo.module.main.launcher;
+package com.mogo.eagle.core.function.main;
 
 import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_BOTTOM;
 import static com.mogo.module.common.entity.V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_BOTTOM_LEFT;
diff --git a/main-extensions/mogo-module-main-launcher/src/main/res/values-ldpi/dimens.xml b/core/function-impl/mogo-core-function-main/src/main/res/values-ldpi/dimens.xml
similarity index 100%
rename from main-extensions/mogo-module-main-launcher/src/main/res/values-ldpi/dimens.xml
rename to core/function-impl/mogo-core-function-main/src/main/res/values-ldpi/dimens.xml
diff --git a/main-extensions/mogo-module-main-launcher/src/main/res/values-mdpi/dimens.xml b/core/function-impl/mogo-core-function-main/src/main/res/values-mdpi/dimens.xml
similarity index 100%
rename from main-extensions/mogo-module-main-launcher/src/main/res/values-mdpi/dimens.xml
rename to core/function-impl/mogo-core-function-main/src/main/res/values-mdpi/dimens.xml
diff --git a/main-extensions/mogo-module-main-launcher/src/main/res/values-xhdpi/dimens.xml b/core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml
similarity index 100%
rename from main-extensions/mogo-module-main-launcher/src/main/res/values-xhdpi/dimens.xml
rename to core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml
diff --git a/main-extensions/mogo-module-main-launcher/src/main/res/values/dimens.xml b/core/function-impl/mogo-core-function-main/src/main/res/values/dimens.xml
similarity index 100%
rename from main-extensions/mogo-module-main-launcher/src/main/res/values/dimens.xml
rename to core/function-impl/mogo-core-function-main/src/main/res/values/dimens.xml
diff --git a/gradle.properties b/gradle.properties
index aa63a7d6ba..7fcb77ce09 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -91,6 +91,7 @@ versionName=8.0.14
 MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.10
 MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.10
 MOGO_CORE_FUNCTION_HMI_VERSION=0.0.10
+MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.10
 MOGO_CORE_FUNCTION_MAP_VERSION=0.0.10
 MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.10
 MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.10
diff --git a/main-extensions/mogo-module-main-launcher/gradle.properties b/main-extensions/mogo-module-main-launcher/gradle.properties
deleted file mode 100644
index 73da301072..0000000000
--- a/main-extensions/mogo-module-main-launcher/gradle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-main-launcher
-VERSION_CODE=1
diff --git a/modules-back.txt b/modules-back.txt
index aa5f38f32b..fbed93ce85 100644
--- a/modules-back.txt
+++ b/modules-back.txt
@@ -43,7 +43,6 @@
 :OCH:mogo-och-bus
 :OCH:mogo-och-noop
 :OCH:mogo-och-taxi
-:main-extensions:mogo-module-main-launcher
 :modules:mogo-module-push-base
 :modules:mogo-module-push-noop
 :modules:mogo-module-push
diff --git a/modules.txt b/modules.txt
index 5992f73bee..e3c75bfad4 100644
--- a/modules.txt
+++ b/modules.txt
@@ -43,7 +43,7 @@
 :OCH:mogo-och-bus
 :OCH:mogo-och-noop
 :OCH:mogo-och-taxi
-:main-extensions:mogo-module-main-launcher
+:core:function-impl:mogo-core-function-main
 :modules:mogo-module-push-base
 :modules:mogo-module-push-noop
 :modules:mogo-module-push
diff --git a/settings.gradle b/settings.gradle
index 57bf0f71d4..89d13be420 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,9 +1,6 @@
 rootProject.name = 'MoGoEagleEye'
 include ':app'
 
-// 应用主入口
-include ':main-extensions:mogo-module-main-launcher'
-
 
 // 核心模块
 // 公用数据实体
@@ -19,6 +16,8 @@ include ':core:mogo-core-function-api'
 // 模块对外暴露等调用接口
 include ':core:mogo-core-function-call'
 // 业务实现
+// Main 应用主入口封装，在这里进行初始化应用
+include ':core:function-impl:mogo-core-function-main'
 // UI 展示及交互
 include ':core:function-impl:mogo-core-function-hmi'
 // 小地图控件