调整结构

app/build.gradle

@@ -53,46 +53,64 @@ android {
         targetCompatibility 1.8
     }
 
-    flavorDimensions "product", "env"
+    flavorDimensions "product","basic" , "env"
 
     productFlavors {
-        // 诺威达
-        nwd {
-            dimension "product"
+        //独立app
+        independent{
+            dimension "basic"
             sourceSets {
                 main {
-                    manifest.srcFile 'src/nwd/AndroidManifest.xml'
+                    manifest.srcFile 'src/independent/AndroidManifest.xml'
                 }
             }
             applicationId rootProject.ext.android.applicationId
         }
-        d80x {
-            dimension "product"
+        // launcher app
+        launcher{
+            dimension "basic"
             sourceSets {
                 main {
-                    manifest.srcFile 'src/d80x/AndroidManifest.xml'
+                    manifest.srcFile 'src/launcher/AndroidManifest.xml'
                 }
             }
             applicationId rootProject.ext.android.zhidadoApplicationId
         }
-        zhidao {
-            dimension "product"
-            sourceSets {
-                main {
-                    manifest.srcFile 'src/zhidao/AndroidManifest.xml'
-                }
-            }
-            applicationId rootProject.ext.android.applicationId
-        }
+        // 诺威达
+//        nwd {
+//            dimension "product"
+//            sourceSets {
+//                main {
+//                    manifest.srcFile 'src/nwd/AndroidManifest.xml'
+//                }
+//            }
+//            applicationId rootProject.ext.android.applicationId
+//        }
+//        d80x {
+//            dimension "product"
+//            sourceSets {
+//                main {
+//                    manifest.srcFile 'src/d80x/AndroidManifest.xml'
+//                }
+//            }
+//            applicationId rootProject.ext.android.zhidadoApplicationId
+//        }
+//        zhidao {
+//            dimension "product"
+//            sourceSets {
+//                main {
+//                    manifest.srcFile 'src/zhidao/AndroidManifest.xml'
+//                }
+//            }
+//            applicationId rootProject.ext.android.applicationId
+//        }
         // 通用 APP
         catholic {
             dimension "product"
-            sourceSets {
-                main {
-                    manifest.srcFile 'src/catholic/AndroidManifest.xml'
-                }
-            }
-            applicationId rootProject.ext.android.applicationId
+        }
+        // f系列-分体机全系列，未细分
+        f8xx{
+            dimension "product"
         }
         qa {
             dimension "env"
@@ -176,7 +194,8 @@ dependencies {
     }
 
     if (Boolean.valueOf(RELEASE)) {
-        api rootProject.ext.dependencies.modulemain
+        launcherApi rootProject.ext.dependencies.modulemainlauncher
+        independentApi rootProject.ext.dependencies.modulemainindependent
         api rootProject.ext.dependencies.mogocommons
         implementation rootProject.ext.dependencies.modulecommon
         implementation rootProject.ext.dependencies.modulesearch
@@ -186,7 +205,8 @@ dependencies {
         debugImplementation rootProject.ext.dependencies.gpssimulatordebug
         releaseImplementation rootProject.ext.dependencies.gpssimulatornoop
     } else {
-        implementation project(':modules:mogo-module-main')
+        launcherImplementation project(':main-extensions:mogo-module-main-launcher')
+        independentImplementation project(':main-extensions:mogo-module-main-independent')
         implementation project(':foudations:mogo-commons')
         implementation project(':modules:mogo-module-common')
         implementation project(':modules:mogo-module-search')

app/src/catholic/AndroidManifest.xml

@@ -12,38 +12,11 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme.App"
         tools:replace="android:label">
-        <activity
-            android:name="com.mogo.module.main.MainActivity"
-            android:clearTaskOnLaunch="true"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:enabled="true"
-            android:launchMode="singleInstance"
-            android:resizeableActivity="true"
-            android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
-            android:stateNotNeeded="true"
-            android:taskAffinity=""
-            android:theme="@style/Main"
-            android:windowSoftInputMode="adjustPan|stateHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER"/>
-                <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>
+
         <!-- 高德地图 -->
-        <meta-data
-            android:name="com.amap.api.v2.apikey"
-            android:value="a36b9f7b086fa3951bb35338a5a06dd3" />
+<!--        <meta-data-->
+<!--            android:name="com.amap.api.v2.apikey"-->
+<!--            android:value="a36b9f7b086fa3951bb35338a5a06dd3" />-->
     </application>
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />

app/src/d80x/AndroidManifest.xml

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.mogo.launcher"
-    android:sharedUserId="android.uid.system">
-
-    <application
-        android:name=".MogoApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_shell_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme.App"
-        tools:replace="android:label">
-        <!-- 高德地图 -->
-        <meta-data
-            tools:replace="android:value"
-            android:name="com.amap.api.v2.apikey"
-            android:value="40e2e7e773c7562b1f2b13699a93992c" />
-
-        <activity
-            android:name="com.mogo.module.main.MainActivity"
-            android:clearTaskOnLaunch="true"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:enabled="true"
-            android:launchMode="singleInstance"
-            android:resizeableActivity="true"
-            android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
-            android:stateNotNeeded="true"
-            android:taskAffinity=""
-            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>
-
-        <provider
-            android:name="com.mogo.module.navi.cp.AddressContentProvider"
-            android:authorities="com.zhidao.auto.personal.provider"
-            android:enabled="true"
-            android:exported="true" />
-    </application>
-
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-</manifest>

app/src/independent/AndroidManifest.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.mogo.launcher">
+
+    <application
+        android:name=".MogoApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_shell_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme.App"
+        tools:replace="android:label">
+        <!-- 高德地图 -->
+        <meta-data
+            tools:replace="android:value"
+            android:name="com.amap.api.v2.apikey"
+            android:value="40e2e7e773c7562b1f2b13699a93992c" />
+        <provider
+            android:name="com.mogo.module.navi.cp.AddressContentProvider"
+            android:authorities="com.zhidao.auto.personal.provider"
+            android:enabled="true"
+            android:exported="true" />
+    </application>
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+</manifest>

app/src/launcher/AndroidManifest.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.mogo.launcher">
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <application
+        android:name=".MogoApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_shell_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme.App"
+        tools:replace="android:label">
+        <provider
+            android:name="com.mogo.module.navi.cp.AddressContentProvider"
+            android:authorities="com.zhidao.auto.personal.provider"
+            android:enabled="true"
+            android:exported="true" />
+        <!-- 高德地图 -->
+        <meta-data
+            android:name="com.amap.api.v2.apikey"
+            android:value="a36b9f7b086fa3951bb35338a5a06dd3" />
+    </application>
+
+</manifest>

app/src/main/AndroidManifest.xml

@@ -14,46 +14,15 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme.App"
         tools:replace="android:label">
-        <activity
-            android:name="com.mogo.module.main.MainActivity"
-            android:clearTaskOnLaunch="true"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:enabled="true"
-            android:launchMode="singleInstance"
-            android:resizeableActivity="true"
-            android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
-            android:stateNotNeeded="true"
-            android:taskAffinity=""
-            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>
-        <provider
-            android:name="com.mogo.module.navi.cp.AddressContentProvider"
-            android:authorities="com.zhidao.auto.personal.provider"
-            android:enabled="true"
-            android:exported="true" />
+<!--        <provider-->
+<!--            android:name="com.mogo.module.navi.cp.AddressContentProvider"-->
+<!--            android:authorities="com.zhidao.auto.personal.provider"-->
+<!--            android:enabled="true"-->
+<!--            android:exported="true" />-->
         <!-- 高德地图 -->
-        <meta-data
-            android:name="com.amap.api.v2.apikey"
-            android:value="a36b9f7b086fa3951bb35338a5a06dd3" />
+<!--        <meta-data-->
+<!--            android:name="com.amap.api.v2.apikey"-->
+<!--            android:value="a36b9f7b086fa3951bb35338a5a06dd3" />-->
     </application>
 
 </manifest>

app/src/nwd/AndroidManifest.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.mogo.launcher"
-    android:sharedUserId="android.uid.system">
-
-    <application
-        android:name=".MogoApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_shell_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme.App"
-        tools:replace="android:label">
-        <activity
-            android:name="com.mogo.module.main.MainActivity"
-            android:clearTaskOnLaunch="true"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:enabled="true"
-            android:launchMode="singleInstance"
-            android:resizeableActivity="true"
-            android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
-            android:stateNotNeeded="true"
-            android:taskAffinity=""
-            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>
-        <provider
-            android:name="com.mogo.module.navi.cp.AddressContentProvider"
-            android:authorities="com.zhidao.auto.personal.provider"
-            android:enabled="true"
-            android:exported="true" />
-        <!-- 高德地图 -->
-        <meta-data
-            android:name="com.amap.api.v2.apikey"
-            android:value="a36b9f7b086fa3951bb35338a5a06dd3" />
-    </application>
-
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-</manifest>

app/src/zhidao/AndroidManifest.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.mogo.launcher">
-
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-    <application
-        android:name=".MogoApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_shell_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme.App"
-        tools:replace="android:label">
-        <activity
-            android:name="com.mogo.module.main.MainActivity"
-            android:clearTaskOnLaunch="true"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize"
-            android:enabled="true"
-            android:launchMode="singleInstance"
-            android:resizeableActivity="true"
-            android:resumeWhilePausing="true"
-            android:screenOrientation="landscape"
-            android:stateNotNeeded="true"
-            android:taskAffinity=""
-            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>
-        <provider
-            android:name="com.mogo.module.navi.cp.AddressContentProvider"
-            android:authorities="com.zhidao.auto.personal.provider"
-            android:enabled="true"
-            android:exported="true" />
-        <!-- 高德地图 -->
-        <meta-data
-            android:name="com.amap.api.v2.apikey"
-            android:value="a36b9f7b086fa3951bb35338a5a06dd3" />
-    </application>
-
-</manifest>