架构升级增加目录结构

Signed-off-by: 董宏宇 <martindhy@gmail.com>

.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="modules">
@@ -16,6 +16,12 @@
             <option value="$PROJECT_DIR$/OCH/mogo-och-noop" />
             <option value="$PROJECT_DIR$/OCH/mogo-och-taxi" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/core" />
+            <option value="$PROJECT_DIR$/core/mogo-core-data" />
+            <option value="$PROJECT_DIR$/core/mogo-core-function-api" />
+            <option value="$PROJECT_DIR$/core/mogo-core-function-call-api" />
+            <option value="$PROJECT_DIR$/core/mogo-core-function-call-impl" />
+            <option value="$PROJECT_DIR$/core/mogo-core-function-impl" />
             <option value="$PROJECT_DIR$/foudations" />
             <option value="$PROJECT_DIR$/foudations/mogo-aicloud-services-sdk" />
             <option value="$PROJECT_DIR$/foudations/mogo-commons" />
@@ -35,7 +41,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-back" />
             <option value="$PROJECT_DIR$/modules/mogo-module-check" />
             <option value="$PROJECT_DIR$/modules/mogo-module-common" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-data" />
             <option value="$PROJECT_DIR$/modules/mogo-module-extensions" />
             <option value="$PROJECT_DIR$/modules/mogo-module-hmi" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel" />
@@ -81,7 +86,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

core/README.md

@@ -0,0 +1,10 @@
+## 模块说明
+本模块用来编写鹰眼核型功能
+
+mogo-core-data：定义基础业务所需要的数据结构
+
+mogo-core-function-api：定义基础业务功能的接口
+mogo-core-function-impl：定义基础业务功能的接口的功能具体实现
+
+mogo-core-function-call-api：定义基础业务暴露给外部调用的接口
+mogo-core-function-call-impl：定义基础业务暴露给外部调用的接口调用实现

core/mogo-core-function-api/.gitignore

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

core/mogo-core-function-api/build.gradle

@@ -0,0 +1,36 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+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'
+    }
+
+    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.kotlinstdlibjdk7
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/mogo-core-function-api/gradle.properties

@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-data
+VERSION_CODE=1

core/mogo-core-function-api/proguard-rules.pro

@@ -0,0 +1,21 @@
+# 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/mogo-core-function-api/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.eagle.core.function.api">
+
+</manifest>

core/mogo-core-function-call-api/.gitignore

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

core/mogo-core-function-call-api/build.gradle

@@ -0,0 +1,36 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+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'
+    }
+
+    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.kotlinstdlibjdk7
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

core/mogo-core-function-call-api/gradle.properties

@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-data
+VERSION_CODE=1

core/mogo-core-function-call-api/proguard-rules.pro

@@ -0,0 +1,21 @@
+# 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/mogo-core-function-call-api/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.eagle.core.function.call.api">
+
+</manifest>

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

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

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

@@ -0,0 +1,36 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+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'
+    }
+
+    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.kotlinstdlibjdk7
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

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

@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-data
+VERSION_CODE=1

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

@@ -0,0 +1,21 @@
+# 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/mogo-core-function-call-impl/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.eagle.core.function.call.impl">
+
+</manifest>

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

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

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

@@ -0,0 +1,36 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+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'
+    }
+
+    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.kotlinstdlibjdk7
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()

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

@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-data
+VERSION_CODE=1

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

@@ -0,0 +1,21 @@
+# 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/mogo-core-function-impl/src/main/AndroidManifest.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.eagle.core.function.impl">
+
+</manifest>

modules/mogo-module-hmi/build.gradle

@@ -68,7 +68,7 @@ dependencies {
         api project(':services:mogo-service-api')
         implementation project(':modules:mogo-module-common')
         implementation project(':modules:mogo-module-service')
-        implementation project(':modules:mogo-module-data')
+        implementation project(':core:mogo-core-data')
     }
 
 }

modules/mogo-module-obu-mogo/build.gradle

@@ -59,7 +59,7 @@ dependencies {
         api project(":foudations:mogo-utils")
         api project(':services:mogo-service-api')
         implementation project(':modules:mogo-module-common')
-        implementation project(':modules:mogo-module-data')
+        implementation project(':core:mogo-core-data')
     }
 
     implementation rootProject.ext.dependencies.mogoobu

services/mogo-service-api/build.gradle

@@ -60,7 +60,7 @@ dependencies {
     } else {
         api project(":libraries:mogo-map-api")
         api project(":skin:mogo-skin-support")
-        implementation project(':modules:mogo-module-data')
+        implementation project(':core:mogo-core-data')
     }
 }
 

settings.gradle

@@ -1,18 +1,72 @@
 rootProject.name = 'MoGoEagleEye'
 include ':app'
+
+// 应用主入口
+include ':main-extensions:mogo-module-main-launcher'
+
+// 服务
+include ':services:mogo-service-api'
+include ':services:mogo-service'
+
+// 模块
+include ':foudations:mogo-aicloud-services-sdk'
+include ':foudations:mogo-utils'
+include ':foudations:mogo-commons'
+
+// 基础库
+include ':libraries:map-custom'
+include ':libraries:mogo-map-api'
+include ':libraries:map-autonavi'
+include ':libraries:mogo-map'
+include ':libraries:tanlulib'
+
+// 核心模块
+include ':core:mogo-core-data'
+include ':core:mogo-core-function-api'
+include ':core:mogo-core-function-impl'
+include ':core:mogo-core-function-call-api'
+include ':core:mogo-core-function-call-impl'
+
+// 业务模块
+include ':modules:mogo-module-obu-mogo'
+include ':modules:mogo-module-hmi'
+include ':modules:mogo-module-widgets'
+include ':modules:mogo-module-monitor'
+include ':modules:mogo-module-left-panel-noop'
+include ':modules:mogo-module-left-panel'
+include ':modules:mogo-module-obu'
+include ':modules:mogo-module-smp'
 include ':modules:mogo-module-adas'
 include ':modules:mogo-module-check'
-include ':foudations:mogo-aicloud-services-sdk'
-include ':modules:mogo-module-smp'
+include ':modules:mogo-module-map'
+include ':modules:mogo-module-common'
+include ':modules:mogo-module-main'
+include ':modules:mogo-module-search'
+include ':modules:mogo-module-share'
+include ':modules:mogo-module-service'
+include ':modules:mogo-module-back'
+include ':modules:mogo-module-authorize'
+include ':modules:mogo-module-apps'
+include ':modules:mogo-module-extensions'
+include ':modules:mogo-module-v2x'
+include ':modules:mogo-module-push'
+include ':modules:mogo-module-push-base'
+include ':modules:mogo-module-push-noop'
+
+// 语音
 include ':tts:tts-base'
 include ':tts:tts-di'
 include ':tts:tts-zhi'
 include ':tts:tts-pad'
 include ':tts:tts-noop'
+
+// 测试DEBUG
 include ':test:crashreport'
 include ':test:crashreport-bugly'
 include ':test:crashreport-noop'
 include ':test:crashreport-upgrade'
+
+// 换肤
 include ':skin:skin-support'
 include ':skin:skin-support-appcompat'
 include ':skin:skin-support-cardview'
@@ -22,47 +76,10 @@ include ':skin:mogo-skin-light'
 include ':skin:mogo-skin-support-impl'
 include ':skin:mogo-skin-support-noop'
 include ':skin:mogo-skin-support'
-include ':modules:mogo-module-widgets'
-include ':modules:mogo-module-monitor'
-include ':modules:mogo-module-left-panel-noop'
-include ':modules:mogo-module-left-panel'
-include ':modules:mogo-module-obu'
-include ':foudations:mogo-utils'
-include ':services:mogo-service-api'
-include ':services:mogo-service'
-include ':libraries:mogo-map'
-include ':foudations:mogo-commons'
-include ':modules:mogo-module-map'
-include ':modules:mogo-module-common'
-include ':modules:mogo-module-main'
-include ':modules:mogo-module-search'
-include ':modules:mogo-module-share'
-include ':modules:mogo-module-service'
-include ':modules:mogo-module-back'
-include ':modules:mogo-module-authorize'
-include ':libraries:map-custom'
-include ':libraries:mogo-map-api'
-include ':modules:mogo-module-apps'
-include ':modules:mogo-module-extensions'
-include ':libraries:map-autonavi'
-include ':modules:mogo-module-v2x'
-include ':main-extensions:mogo-module-main-launcher'
 
-include ':modules:mogo-module-push'
-include ':modules:mogo-module-push-base'
-include ':modules:mogo-module-push-noop'
-
-
-include ':libraries:tanlulib'
-include ':skin'
-include ':test'
-include ':tts'
-
-include ':OCH'
+// 网约车
 include ':OCH:mogo-och-taxi'
 include ':OCH:mogo-och-bus'
 include ':OCH:mogo-och-noop'
 include ':OCH:mogo-och'
-include ':modules:mogo-module-obu-mogo'
-include ':modules:mogo-module-hmi'
-include ':modules:mogo-module-data'
+