[Update]

合并main与hmi模块

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

app/build.gradle

@@ -237,18 +237,18 @@ dependencies {
     releaseImplementation rootProject.ext.dependencies.releaseleakcanary
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.mogo_core_function_main
         implementation rootProject.ext.dependencies.ttspad
+        implementation rootProject.ext.dependencies.mogo_core_function_hmi
+
         androidTestImplementation rootProject.ext.dependencies.mogo_core_function_call
         androidTestImplementation rootProject.ext.dependencies.mogo_core_res
-        androidTestImplementation rootProject.ext.dependencies.mogo_core_function_hmi
         androidTestImplementation rootProject.ext.dependencies.mogo_core_function_notice
     } else {
-        implementation project(':core:function-impl:mogo-core-function-main')
         implementation project(':tts:tts-pad')
+        implementation project(':core:function-impl:mogo-core-function-hmi')
+        
         androidTestImplementation project(':core:mogo-core-function-call')
         androidTestImplementation project(':core:mogo-core-res')
-        androidTestImplementation project(':core:function-impl:mogo-core-function-hmi')
         androidTestImplementation project(':core:function-impl:mogo-core-function-notice')
     }
 

app/src/main/AndroidManifest.xml

@@ -13,9 +13,9 @@
         android:label="@string/app_shell_name"
         android:largeHeap="true"
         android:resizeableActivity="false"
-        android:usesCleartextTraffic="true"
         android:supportsRtl="true"
-        android:theme="@style/Main"
+        android:theme="@style/AppTheme.App"
+        android:usesCleartextTraffic="true"
         tools:replace="android:label">
 
         <!-- 配置APP ID -->
@@ -36,7 +36,6 @@
             android:value="${MAP_SDK_VERSION}" />
 
 
-
     </application>
 
 </manifest>

app/src/main/res/values/colors.xml

@@ -5,4 +5,6 @@
     <color name="colorAccent">#D81B60</color>
 
 
+    <color name="app_window_background">#1C1C1C</color>
+
 </resources>

app/src/main/res/values/styles.xml

@@ -1,12 +1,32 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
+
+    <style name="AppTheme.App" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:statusBarColor" tools:targetApi="lollipop">@android:color/transparent
+        </item>
+        <item name="android:windowEnterAnimation">@null</item>
+        <item name="android:windowExitAnimation">@null</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowBackground">@color/app_window_background</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowFullscreen">false</item>
+        <item name="android:windowAnimationStyle">@style/Animation</item>
     </style>
 
+    <style name="Animation">
+        <item name="android:activityOpenEnterAnimation">@null</item>
+        <item name="android:activityOpenExitAnimation">@null</item>
+        <item name="android:activityCloseEnterAnimation">@null</item>
+        <item name="android:activityCloseExitAnimation">@null</item>
+        <item name="android:taskOpenEnterAnimation">@null</item>
+        <item name="android:taskOpenExitAnimation">@null</item>
+        <item name="android:taskCloseEnterAnimation">@null</item>
+        <item name="android:taskCloseExitAnimation">@null</item>
+        <item name="android:taskToFrontEnterAnimation">@null</item>
+        <item name="android:taskToFrontExitAnimation">@null</item>
+        <item name="android:taskToBackEnterAnimation">@null</item>
+        <item name="android:taskToBackExitAnimation">@null</item>
+    </style>
 
 </resources>

core/function-impl/mogo-core-function-hmi/build.gradle

@@ -5,6 +5,7 @@ plugins {
     id 'kotlin-kapt'
     id 'com.alibaba.arouter'
 }
+
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
     // buildToolsVersion rootProject.ext.android.buildToolsVersion
@@ -50,39 +51,93 @@ dependencies {
     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.flexbox
+
+    implementation rootProject.ext.dependencies.rxandroid
     implementation rootProject.ext.dependencies.mogoaicloudtrafficlive
 
-    kapt rootProject.ext.dependencies.aroutercompiler
     kapt rootProject.ext.dependencies.androidxroomcompiler
     implementation rootProject.ext.dependencies.androidxroomruntime
     implementation rootProject.ext.dependencies.androidxroomktx
 
+    //Crash日志收集
+    implementation rootProject.ext.dependencies.crashSdk
+    implementation rootProject.ext.dependencies.boostmultidex
+
+    debugImplementation rootProject.ext.dependencies.debugleakcanary
+    releaseImplementation rootProject.ext.dependencies.releaseleakcanary
+
+    implementation rootProject.ext.dependencies.arouter
+    kapt rootProject.ext.dependencies.aroutercompiler
+
+    implementation rootProject.ext.dependencies.mogoami
+
+    implementation rootProject.ext.dependencies.mogochainbase
 
     if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        implementation rootProject.ext.dependencies.modulecommon
-        compileOnly rootProject.ext.dependencies.mogoserviceapi
+        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.mogomap
+        api rootProject.ext.dependencies.crashreportupgrade
+//        api rootProject.ext.dependencies.crashreportbugly
+
+        api rootProject.ext.dependencies.mogo_core_res
+        api rootProject.ext.dependencies.mogo_core_data
+        api rootProject.ext.dependencies.mogo_core_utils
+        api rootProject.ext.dependencies.mogo_core_network
+        api rootProject.ext.dependencies.mogo_core_function_obu_mogo
+        api rootProject.ext.dependencies.mogo_core_function_notice
+        api rootProject.ext.dependencies.mogo_core_function_bindingcar
+        api rootProject.ext.dependencies.mogo_core_function_autopilot
+        api rootProject.ext.dependencies.mogo_core_function_check
+        api rootProject.ext.dependencies.mogo_core_function_map
+        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.mogo_core_function_api
+
         implementation project(':libraries:map-usbcamera')
 
-        implementation rootProject.ext.dependencies.mogo_core_res
-        implementation rootProject.ext.dependencies.mogo_core_data
-        implementation rootProject.ext.dependencies.mogo_core_utils
-        implementation rootProject.ext.dependencies.mogo_core_network
-        implementation rootProject.ext.dependencies.mogo_core_function_call
     } else {
-        implementation project(':modules:mogo-module-common')
-        implementation project(':services:mogo-service-api')
-        implementation project(':libraries:map-usbcamera')
+        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')
 
-        implementation project(':core:mogo-core-res')
-        implementation project(':core:mogo-core-data')
-        implementation project(':core:mogo-core-utils')
-        implementation project(':core:mogo-core-network')
-        implementation project(':core:mogo-core-function-api')
-        implementation project(':core:mogo-core-function-call')
+        api project(':modules:mogo-module-service')
+        api project(':libraries:mogo-map')
+        api project(':test:crashreport-upgrade')
+//        api project(':test:crashreport-bugly')
+        api project(':test:crashreport-apmbyte')
+
+        api project(':core:mogo-core-res')
+        api project(':core:mogo-core-data')
+        api project(':core:mogo-core-utils')
+        api project(':core:function-impl:mogo-core-function-obu-mogo')
+        api project(':core:function-impl:mogo-core-function-autopilot')
+        api project(':core:function-impl:mogo-core-function-check')
+        api project(':core:function-impl:mogo-core-function-map')
+        api project(':core:function-impl:mogo-core-function-notice')
+        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:function-impl:mogo-core-function-dispatch')
+        api project(':core:function-impl:mogo-core-function-chat')
+        api project(':core:function-impl:mogo-core-function-bindingcar')
+
+        api project(':core:mogo-core-function-call')
+        api project(':core:mogo-core-function-api')
+
+        api project(':libraries:map-usbcamera')
     }
 }
 

core/function-impl/mogo-core-function-hmi/src/main/AndroidManifest.xml

@@ -3,9 +3,73 @@
     package="com.mogo.eagle.core.function.hmi">
 
 
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <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.KILL_BACKGROUND_PROCESSES" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application>
 
+        <!-- &lt;!&ndash;保活用&ndash;&gt;
+       <service
+           android:name="com.zhidao.boot.persistent.lib.PersistentAliveService"
+           android:enabled="true"
+           android:exported="true">
+           <intent-filter>
+               <action android:name="com.zhidao.boot.persistent.lib.action" />
+           </intent-filter>
+       </service>
+
+       <activity
+           android:name="com.zhidao.boot.persistent.lib.PersistentAliveActivity"
+           android:resizeableActivity="false"
+           android:screenOrientation="landscape"
+           android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+-->
+        <activity
+            android:name="com.mogo.eagle.core.function.main.MainLauncherActivity"
+            android:clearTaskOnLaunch="true"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
+            android:enabled="true"
+            android:launchMode="singleTop"
+            android:resizeableActivity="false"
+            android:resumeWhilePausing="true"
+            android:screenOrientation="landscape"
+            android:stateNotNeeded="true"
+            android:theme="@style/Main"
+            android:windowSoftInputMode="adjustPan|stateHidden">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <!--调试用，暂时开启LAUNCHER这个属性-->
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER_APP" />
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <data
+                    android:host="launcher"
+                    android:path="/main/switch2"
+                    android:scheme="mogo" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+        </activity>
+
+        <service
+            android:name="com.mogo.eagle.core.function.main.service.MogoMainService"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.mogo.launcher.action.MAIN_SERVICE" />
+            </intent-filter>
+        </service>
+
         <receiver android:name="com.mogo.eagle.core.function.hmi.receiver.V2XWarningBroadcastReceiver">
             <intent-filter>
                 <action android:name="com.hmi.v2x.notification" />

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java

@@ -25,6 +25,7 @@ import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
 import com.mogo.eagle.core.data.map.MogoLocation;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
+import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.function.main.cards.MogoModulesManager;
 import com.mogo.eagle.core.function.main.service.MogoMainService;
 import com.mogo.eagle.core.function.main.utils.DisplayEffectsHelper;
@@ -33,7 +34,6 @@ import com.mogo.eagle.core.utilcode.mogo.AppLaunchTimeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.permissions.PermissionsDialogUtils;
 import com.mogo.eagle.core.utilcode.mogo.toast.ResourcesHelper;
-import com.mogo.eagle.core.utilcode.util.BarUtils;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
 import com.mogo.eagle.core.utilcode.util.ProcessUtils;
 import com.mogo.map.listener.IMogoHosListenerRegister;

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainLauncherActivity.java

@@ -13,6 +13,7 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionProvider;
+import com.mogo.eagle.core.function.hmi.R;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.service.intent.IMogoIntentListener;

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java

@@ -39,7 +39,6 @@ import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.cloud.socket.IMogoLifecycleListener;
 import com.mogo.test.crashreport.CrashReportConstants;
 import com.mogo.test.crashreport.upgrade.UpgradeReportConstants;
-import com.zhidao.boot.persistent.lib.PersistentManager;
 import com.zhidao.support.obu.ami.AmiClientManager;
 
 import java.lang.reflect.Field;
@@ -354,11 +353,6 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
             MogoModulePaths.addModuleFunctionServer(new MogoModule(MogoServicePaths.PATH_MAP_DATA_COLLECT_PROVIDER, "MoGoMapDataCollector"));
         }
 
-        if (!DebugConfig.isLauncher()) {
-            PersistentManager
-                    .getInstance().initManager(this);
-        }
-
         CallerLogger.INSTANCE.i(M_MAIN + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms");
     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/SchemeIntent.java

@@ -176,9 +176,9 @@ public class SchemeIntent implements IMogoStatusChangedListener {
         mApis.getAnalyticsApi().track("appenterfront", properties);
     }
 
-    /*
+    /**
      * 语音打开事件面板
-     * */
+     */
     private void handleShowEventPanel(int item) {
         CallerLogger.INSTANCE.d(M_MAIN + TAG, "语音打开事件面板" + item);
         //mApis.getEventPanelManager().showPanelWithSelectedItem(item);

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/utils/DisplayEffectsHelper.java

@@ -6,7 +6,8 @@ import android.content.res.Resources;
 import android.util.DisplayMetrics;
 import android.view.View;
 
-import com.mogo.eagle.core.function.main.R;
+import com.mogo.eagle.core.function.hmi.R;
+
 
 /**
  * created by wujifei on 2021/3/30 14:05

core/function-impl/mogo-core-function-hmi/src/main/res/values/color.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="module_main_window_background_color">#212831</color>
+
     <color name="notice_blue">#2B6EFF</color>
     <color name="notice_text_blue">#1F9BFE</color>
     <color name="notice_banner_blue">#5A8EFD</color>

core/function-impl/mogo-core-function-main/.gitignore

@@ -1 +0,0 @@
-/build

core/function-impl/mogo-core-function-main/build.gradle

@@ -1,121 +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'])
-    //Crash日志收集
-    implementation rootProject.ext.dependencies.crashSdk
-    implementation rootProject.ext.dependencies.androidxappcompat
-    implementation rootProject.ext.dependencies.boostmultidex
-
-    debugImplementation rootProject.ext.dependencies.debugleakcanary
-    releaseImplementation rootProject.ext.dependencies.releaseleakcanary
-
-    implementation rootProject.ext.dependencies.androidxconstraintlayout
-
-    implementation rootProject.ext.dependencies.arouter
-    kapt rootProject.ext.dependencies.aroutercompiler
-
-    implementation rootProject.ext.dependencies.mogoami
-
-    implementation rootProject.ext.dependencies.mogochainbase
-
-    if (Boolean.valueOf(USE_MAVEN_PACKAGE)) {
-        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.mogomap
-        api rootProject.ext.dependencies.crashreportupgrade
-//        api rootProject.ext.dependencies.crashreportbugly
-
-        api rootProject.ext.dependencies.mogo_core_data
-        api rootProject.ext.dependencies.mogo_core_utils
-        api rootProject.ext.dependencies.mogo_core_function_obu_mogo
-        api rootProject.ext.dependencies.mogo_core_function_hmi
-        api rootProject.ext.dependencies.mogo_core_function_notice
-        api rootProject.ext.dependencies.mogo_core_function_bindingcar
-        api rootProject.ext.dependencies.mogo_core_function_autopilot
-        api rootProject.ext.dependencies.mogo_core_function_check
-        api rootProject.ext.dependencies.mogo_core_function_map
-        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
-
-    } 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(':libraries:mogo-map')
-        api project(':test:crashreport-upgrade')
-//        api project(':test:crashreport-bugly')
-        api project(':test:crashreport-apmbyte')
-
-        api project(':core:mogo-core-data')
-        api project(':core:mogo-core-utils')
-        api project(':core:function-impl:mogo-core-function-obu-mogo')
-        api project(':core:function-impl:mogo-core-function-hmi')
-        api project(':core:function-impl:mogo-core-function-autopilot')
-        api project(':core:function-impl:mogo-core-function-check')
-        api project(':core:function-impl:mogo-core-function-map')
-        api project(':core:function-impl:mogo-core-function-notice')
-        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:function-impl:mogo-core-function-dispatch')
-        api project(':core:mogo-core-function-call')
-        api project(':core:function-impl:mogo-core-function-chat')
-        api project(':core:function-impl:mogo-core-function-bindingcar')
-    }
-}
-
-apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/function-impl/mogo-core-function-main/gradle.properties

@@ -1,3 +0,0 @@
-GROUP=com.mogo.eagle.core.function.impl
-POM_ARTIFACT_ID=main
-VERSION_CODE=1

core/function-impl/mogo-core-function-main/proguard-rules.pro

@@ -1,21 +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

core/function-impl/mogo-core-function-main/src/main/AndroidManifest.xml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.eagle.core.function.main">
-
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <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.KILL_BACKGROUND_PROCESSES" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
-    <application>
-       <!-- &lt;!&ndash;保活用&ndash;&gt;
-        <service
-            android:name="com.zhidao.boot.persistent.lib.PersistentAliveService"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.zhidao.boot.persistent.lib.action" />
-            </intent-filter>
-        </service>
-
-        <activity
-            android:name="com.zhidao.boot.persistent.lib.PersistentAliveActivity"
-            android:resizeableActivity="false"
-            android:screenOrientation="landscape"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
--->
-        <activity
-            android:name=".MainLauncherActivity"
-            android:clearTaskOnLaunch="true"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:enabled="true"
-            android:launchMode="singleTop"
-            android:resizeableActivity="false"
-            android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
-            android:stateNotNeeded="true"
-            android:windowSoftInputMode="adjustPan|stateHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <!--调试用，暂时开启LAUNCHER这个属性-->
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.intent.category.LAUNCHER_APP" />
-                <category android:name="android.intent.category.HOME" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <data
-                    android:host="launcher"
-                    android:path="/main/switch2"
-                    android:scheme="mogo" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-        </activity>
-
-        <service
-            android:name="com.mogo.eagle.core.function.main.service.MogoMainService"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="com.mogo.launcher.action.MAIN_SERVICE" />
-            </intent-filter>
-        </service>
-    </application>
-</manifest>

core/function-impl/mogo-core-function-main/src/main/res/values-mdpi/dimens.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="module_main_entrance_fragment_container_marginLeft_out_vr_mode" >444px</dimen>
-    <!--    module_main_activity_main.xml-->
-    <dimen name="module_main_map_left_shadow_frame_width">350px</dimen>
-    <dimen name="module_main_card_container_marginTop">8px</dimen>
-    <dimen name="module_main_card_container_width">352px</dimen>
-    <dimen name="module_main_card_container_height">370px</dimen>
-    <dimen name="module_main_card_container_marginLeft">32px</dimen>
-    <dimen name="module_main_card_container_marginBottom">140.5px</dimen>
-    <dimen name="module_main_card_container_paddingBottom">18px</dimen>
-    <dimen name="module_main_card_card_shadow_width_div">20px</dimen>
-    <dimen name="module_main_card_card_shadow_height_div">10px</dimen>
-    <dimen name="module_main_top_shadow_height">144px</dimen>
-    <dimen name="module_main_card_cover_up_margin">352px</dimen>
-
-    <dimen name="cards_container_dp_600">320px</dimen>
-    <dimen name="cards_container_shadow_dp_margin_top">319px</dimen>
-
-    <dimen name="module_main_apps_fragment_container_width">110px</dimen>
-    <dimen name="module_main_apps_fragment_container_padding">6px</dimen>
-    <dimen name="module_main_header_fragment_container_marginTop">15px</dimen>
-    <dimen name="module_main_header_fragment_container_marginLeft">460px</dimen>
-    <dimen name="module_main_id_entrance_fragment_container_marginLeft">444px</dimen>
-    <dimen name="module_main_entrance_fragment_container_marginLeft_in_vr_mode" >0px</dimen>
-    <dimen name="module_main_id_left_panel_fragment_container_width">350px</dimen>
-    <dimen name="module_main_entrance_fragment_container_padding">10px</dimen>
-    <dimen name="module_main_entrance_fragment_container_padding_top">16px</dimen>
-    <dimen name="module_main_entrance_fragment_container_width">658px</dimen>
-    <dimen name="module_event_fragment_container_padding">8px</dimen>
-    <dimen name="module_main_apps_fragment_container_paddingTop">2px</dimen>
-    <dimen name="module_main_apps_fragment_container_paddingBottom">2px</dimen>
-    <dimen name="module_ext_top_view_max_width">1920px</dimen>
-
-    <dimen name="module_main_panel_margin_right">0px</dimen>
-    <!--事件面板-->
-    <dimen name="module_main_event_panel_fragment_paddingTop">0px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingBottom">0px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingLeft">6px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingRight">6px</dimen>
-</resources>

core/function-impl/mogo-core-function-main/src/main/res/values-xhdpi/dimens.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="module_main_entrance_fragment_container_marginLeft_out_vr_mode" >800px</dimen>
-    <!--    module_main_activity_main.xml-->
-    <dimen name="module_main_map_left_shadow_frame_width">350px</dimen>
-    <dimen name="module_main_card_container_marginTop">10px</dimen>
-    <dimen name="module_main_card_container_width">660px</dimen>
-    <dimen name="module_main_card_container_height">690px</dimen>
-    <dimen name="module_main_card_container_marginLeft">60px</dimen>
-    <dimen name="module_main_card_container_marginBottom">211px</dimen>
-    <dimen name="module_main_card_container_paddingBottom">30px</dimen>
-    <dimen name="module_main_card_card_shadow_width_div">30px</dimen>
-    <dimen name="module_main_card_card_shadow_height_div">15px</dimen>
-    <dimen name="module_main_top_shadow_height">270px</dimen>
-    <dimen name="module_main_card_cover_up_margin">660px</dimen>
-    <dimen name="cards_container_dp_600">600px</dimen>
-    <dimen name="cards_container_shadow_dp_margin_top">599px</dimen>
-
-    <dimen name="module_main_apps_fragment_container_width">200px</dimen>
-    <dimen name="module_main_apps_fragment_container_padding">20px</dimen>
-    <dimen name="module_main_header_fragment_container_marginTop">30px</dimen>
-    <dimen name="module_main_header_fragment_container_marginLeft">830px</dimen>
-    <dimen name="module_main_id_entrance_fragment_container_marginLeft">800px</dimen>
-    <dimen name="module_main_entrance_fragment_container_marginLeft_in_vr_mode" >0px</dimen>
-    <dimen name="module_main_entrance_fragment_container_padding">20px</dimen>
-    <dimen name="module_main_entrance_fragment_container_padding_top">30px</dimen>
-
-    <dimen name="module_main_id_left_panel_fragment_container_width">340px</dimen>
-    <dimen name="module_main_entrance_fragment_container_width">1313px</dimen>
-    <dimen name="module_event_fragment_container_padding">20px</dimen>
-    <dimen name="module_main_apps_fragment_container_paddingTop">20px</dimen>
-
-    <dimen name="module_main_event_panel_fragment_paddingTop">20px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingBottom">18px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingLeft">18px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingRight">18px</dimen>
-</resources>

core/function-impl/mogo-core-function-main/src/main/res/values/colors.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="module_main_window_background_color">#212831</color>
-
-</resources>

core/function-impl/mogo-core-function-main/src/main/res/values/strings.xml

@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">mogo-module-main</string>
-</resources>

settings.gradle

@@ -21,9 +21,8 @@ include ':core:mogo-core-function-call'
 include ':core:function-impl:mogo-core-function-devatools'
 
 // 业务实现
-// Main 应用主入口封装，在这里进行初始化应用
-include ':core:function-impl:mogo-core-function-main'
 // UI 展示及交互
+// Main 应用主入口封装，在这里进行初始化应用
 include ':core:function-impl:mogo-core-function-hmi'
 // 小地图控件
 // 地图控件，HD-高精地图