diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 33c9610c8f..3eb9e5dad1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ diff --git a/core/README.md b/core/README.md new file mode 100644 index 0000000000..81a1911b20 --- /dev/null +++ b/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：定义基础业务暴露给外部调用的接口调用实现 diff --git a/modules/mogo-module-data/.gitignore b/core/mogo-core-data/.gitignore similarity index 100% rename from modules/mogo-module-data/.gitignore rename to core/mogo-core-data/.gitignore diff --git a/modules/mogo-module-data/README.md b/core/mogo-core-data/README.md similarity index 100% rename from modules/mogo-module-data/README.md rename to core/mogo-core-data/README.md diff --git a/modules/mogo-module-data/build.gradle b/core/mogo-core-data/build.gradle similarity index 100% rename from modules/mogo-module-data/build.gradle rename to core/mogo-core-data/build.gradle diff --git a/modules/mogo-module-data/consumer-rules.pro b/core/mogo-core-data/consumer-rules.pro similarity index 100% rename from modules/mogo-module-data/consumer-rules.pro rename to core/mogo-core-data/consumer-rules.pro diff --git a/modules/mogo-module-data/gradle.properties b/core/mogo-core-data/gradle.properties similarity index 100% rename from modules/mogo-module-data/gradle.properties rename to core/mogo-core-data/gradle.properties diff --git a/modules/mogo-module-data/proguard-rules.pro b/core/mogo-core-data/proguard-rules.pro similarity index 100% rename from modules/mogo-module-data/proguard-rules.pro rename to core/mogo-core-data/proguard-rules.pro diff --git a/modules/mogo-module-data/src/main/AndroidManifest.xml b/core/mogo-core-data/src/main/AndroidManifest.xml similarity index 100% rename from modules/mogo-module-data/src/main/AndroidManifest.xml rename to core/mogo-core-data/src/main/AndroidManifest.xml diff --git a/modules/mogo-module-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt b/core/mogo-core-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt similarity index 100% rename from modules/mogo-module-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt rename to core/mogo-core-data/src/main/java/com/mogo/module/data/enums/WarningDirectionEnum.kt diff --git a/modules/mogo-module-data/src/main/java/com/mogo/module/data/model/V2XThreatIndInfo.kt b/core/mogo-core-data/src/main/java/com/mogo/module/data/model/V2XThreatIndInfo.kt similarity index 100% rename from modules/mogo-module-data/src/main/java/com/mogo/module/data/model/V2XThreatIndInfo.kt rename to core/mogo-core-data/src/main/java/com/mogo/module/data/model/V2XThreatIndInfo.kt diff --git a/core/mogo-core-function-api/.gitignore b/core/mogo-core-function-api/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/core/mogo-core-function-api/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/core/mogo-core-function-api/build.gradle b/core/mogo-core-function-api/build.gradle new file mode 100644 index 0000000000..002aeb57bc --- /dev/null +++ b/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() diff --git a/core/mogo-core-function-api/consumer-rules.pro b/core/mogo-core-function-api/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/core/mogo-core-function-api/gradle.properties b/core/mogo-core-function-api/gradle.properties new file mode 100644 index 0000000000..803c4a6016 --- /dev/null +++ b/core/mogo-core-function-api/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.module +POM_ARTIFACT_ID=module-data +VERSION_CODE=1 diff --git a/core/mogo-core-function-api/proguard-rules.pro b/core/mogo-core-function-api/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/core/mogo-core-function-api/src/main/AndroidManifest.xml b/core/mogo-core-function-api/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..73571ca916 --- /dev/null +++ b/core/mogo-core-function-api/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/core/mogo-core-function-call-api/.gitignore b/core/mogo-core-function-call-api/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/core/mogo-core-function-call-api/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/core/mogo-core-function-call-api/build.gradle b/core/mogo-core-function-call-api/build.gradle new file mode 100644 index 0000000000..002aeb57bc --- /dev/null +++ b/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() diff --git a/core/mogo-core-function-call-api/consumer-rules.pro b/core/mogo-core-function-call-api/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/core/mogo-core-function-call-api/gradle.properties b/core/mogo-core-function-call-api/gradle.properties new file mode 100644 index 0000000000..803c4a6016 --- /dev/null +++ b/core/mogo-core-function-call-api/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.module +POM_ARTIFACT_ID=module-data +VERSION_CODE=1 diff --git a/core/mogo-core-function-call-api/proguard-rules.pro b/core/mogo-core-function-call-api/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/core/mogo-core-function-call-api/src/main/AndroidManifest.xml b/core/mogo-core-function-call-api/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..baa0e8faa4 --- /dev/null +++ b/core/mogo-core-function-call-api/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/core/mogo-core-function-call-impl/.gitignore b/core/mogo-core-function-call-impl/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/core/mogo-core-function-call-impl/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/core/mogo-core-function-call-impl/build.gradle b/core/mogo-core-function-call-impl/build.gradle new file mode 100644 index 0000000000..002aeb57bc --- /dev/null +++ b/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() diff --git a/core/mogo-core-function-call-impl/consumer-rules.pro b/core/mogo-core-function-call-impl/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/core/mogo-core-function-call-impl/gradle.properties b/core/mogo-core-function-call-impl/gradle.properties new file mode 100644 index 0000000000..803c4a6016 --- /dev/null +++ b/core/mogo-core-function-call-impl/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.module +POM_ARTIFACT_ID=module-data +VERSION_CODE=1 diff --git a/core/mogo-core-function-call-impl/proguard-rules.pro b/core/mogo-core-function-call-impl/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/core/mogo-core-function-call-impl/src/main/AndroidManifest.xml b/core/mogo-core-function-call-impl/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..479830019d --- /dev/null +++ b/core/mogo-core-function-call-impl/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/core/mogo-core-function-impl/.gitignore b/core/mogo-core-function-impl/.gitignore new file mode 100644 index 0000000000..42afabfd2a --- /dev/null +++ b/core/mogo-core-function-impl/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/core/mogo-core-function-impl/build.gradle b/core/mogo-core-function-impl/build.gradle new file mode 100644 index 0000000000..002aeb57bc --- /dev/null +++ b/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() diff --git a/core/mogo-core-function-impl/consumer-rules.pro b/core/mogo-core-function-impl/consumer-rules.pro new file mode 100644 index 0000000000..e69de29bb2 diff --git a/core/mogo-core-function-impl/gradle.properties b/core/mogo-core-function-impl/gradle.properties new file mode 100644 index 0000000000..803c4a6016 --- /dev/null +++ b/core/mogo-core-function-impl/gradle.properties @@ -0,0 +1,3 @@ +GROUP=com.mogo.module +POM_ARTIFACT_ID=module-data +VERSION_CODE=1 diff --git a/core/mogo-core-function-impl/proguard-rules.pro b/core/mogo-core-function-impl/proguard-rules.pro new file mode 100644 index 0000000000..481bb43481 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/core/mogo-core-function-impl/src/main/AndroidManifest.xml b/core/mogo-core-function-impl/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..851765d341 --- /dev/null +++ b/core/mogo-core-function-impl/src/main/AndroidManifest.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/modules/mogo-module-hmi/build.gradle b/modules/mogo-module-hmi/build.gradle index 3f46c36a3e..4e986bb9d9 100644 --- a/modules/mogo-module-hmi/build.gradle +++ b/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') } } diff --git a/modules/mogo-module-obu-mogo/build.gradle b/modules/mogo-module-obu-mogo/build.gradle index 411735d7a2..44a46d97f7 100644 --- a/modules/mogo-module-obu-mogo/build.gradle +++ b/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 diff --git a/services/mogo-service-api/build.gradle b/services/mogo-service-api/build.gradle index e94afb7dff..5235776e05 100644 --- a/services/mogo-service-api/build.gradle +++ b/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') } } diff --git a/settings.gradle b/settings.gradle index ef1b55c8a3..034b271362 100644 --- a/settings.gradle +++ b/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' +