diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0d36ed5e85..beffe3a707 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -22,6 +22,7 @@
+
diff --git a/core/README.md b/core/README.md
index 81a1911b20..045977cda0 100644
--- a/core/README.md
+++ b/core/README.md
@@ -2,9 +2,9 @@
本模块用来编写鹰眼核型功能
mogo-core-data：定义基础业务所需要的数据结构
+mogo-core-function-res：这里只存放公共资源，图片，布局，动画等
mogo-core-function-api：定义基础业务功能的接口
mogo-core-function-impl：定义基础业务功能的接口的功能具体实现
-mogo-core-function-call-api：定义基础业务暴露给外部调用的接口
-mogo-core-function-call-impl：定义基础业务暴露给外部调用的接口调用实现
+mogo-core-function-call：定义基础业务暴露给外部调用的接口
diff --git a/core/mogo-core-data/build.gradle b/core/mogo-core-data/build.gradle
index 8e0ff7c7f0..d01467da07 100644
--- a/core/mogo-core-data/build.gradle
+++ b/core/mogo-core-data/build.gradle
@@ -44,6 +44,12 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+
+ if (Boolean.valueOf(RELEASE)) {
+
+ } else {
+ implementation project(':core:mogo-core-res')
+ }
}
apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/core/mogo-core-res/.gitignore b/core/mogo-core-res/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/core/mogo-core-res/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/core/mogo-core-res/build.gradle b/core/mogo-core-res/build.gradle
new file mode 100644
index 0000000000..918f0f4f27
--- /dev/null
+++ b/core/mogo-core-res/build.gradle
@@ -0,0 +1,64 @@
+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
+ }
+
+ sourceSets {
+ main {
+ res.srcDirs = [
+ 'src/main/function-common-res',
+ 'src/main/function-adas-res',
+ 'src/main/function-chat-res',
+ 'src/main/function-check-res',
+ 'src/main/function-dispatch-res',
+ 'src/main/function-map-res',
+ 'src/main/function-notice-res',
+ 'src/main/function-obu-res',
+ 'src/main/function-tts-res',
+ 'src/main/function-v2x-res',
+ ]
+ }
+ }
+}
+
+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-res/consumer-rules.pro b/core/mogo-core-res/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/core/mogo-core-res/gradle.properties b/core/mogo-core-res/gradle.properties
new file mode 100644
index 0000000000..585bc34412
--- /dev/null
+++ b/core/mogo-core-res/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.eagle.core
+POM_ARTIFACT_ID=function-call-api
+VERSION_CODE=1
diff --git a/core/mogo-core-res/proguard-rules.pro b/core/mogo-core-res/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/core/mogo-core-res/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-res/src/main/AndroidManifest.xml b/core/mogo-core-res/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..baa0e8faa4
--- /dev/null
+++ b/core/mogo-core-res/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ No newline at end of file
diff --git a/core/mogo-core-res/src/main/function-common-res/drawable-mdpi/placeholder.png b/core/mogo-core-res/src/main/function-common-res/drawable-mdpi/placeholder.png
new file mode 100755
index 0000000000..402c1def01
Binary files /dev/null and b/core/mogo-core-res/src/main/function-common-res/drawable-mdpi/placeholder.png differ
diff --git a/core/mogo-core-res/src/main/function-common-res/drawable-xhdpi/placeholder.png b/core/mogo-core-res/src/main/function-common-res/drawable-xhdpi/placeholder.png
new file mode 100755
index 0000000000..402c1def01
Binary files /dev/null and b/core/mogo-core-res/src/main/function-common-res/drawable-xhdpi/placeholder.png differ
diff --git a/core/mogo-core-res/src/main/function-common-res/drawable/placeholder.png b/core/mogo-core-res/src/main/function-common-res/drawable/placeholder.png
new file mode 100755
index 0000000000..402c1def01
Binary files /dev/null and b/core/mogo-core-res/src/main/function-common-res/drawable/placeholder.png differ
diff --git a/core/mogo-core-res/src/res/drawable/utils_toast_bg.xml b/core/mogo-core-res/src/res/drawable/utils_toast_bg.xml
new file mode 100644
index 0000000000..5e6370b319
--- /dev/null
+++ b/core/mogo-core-res/src/res/drawable/utils_toast_bg.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
diff --git a/core/mogo-core-res/src/res/layout/utils_toast_view.xml b/core/mogo-core-res/src/res/layout/utils_toast_view.xml
new file mode 100644
index 0000000000..59af74b6bb
--- /dev/null
+++ b/core/mogo-core-res/src/res/layout/utils_toast_view.xml
@@ -0,0 +1,72 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/mogo-core-res/src/res/values-v21/styles.xml b/core/mogo-core-res/src/res/values-v21/styles.xml
new file mode 100644
index 0000000000..967acc3c0f
--- /dev/null
+++ b/core/mogo-core-res/src/res/values-v21/styles.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/mogo-core-res/src/res/values/styles.xml b/core/mogo-core-res/src/res/values/styles.xml
new file mode 100644
index 0000000000..0fcfe9b91d
--- /dev/null
+++ b/core/mogo-core-res/src/res/values/styles.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/mogo-core-res/src/res/xml/util_code_provider_paths.xml b/core/mogo-core-res/src/res/xml/util_code_provider_paths.xml
new file mode 100644
index 0000000000..ed731a2299
--- /dev/null
+++ b/core/mogo-core-res/src/res/xml/util_code_provider_paths.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/mogo-core-utils/build.gradle b/core/mogo-core-utils/build.gradle
index fbab7a0b71..767f408c5b 100644
--- a/core/mogo-core-utils/build.gradle
+++ b/core/mogo-core-utils/build.gradle
@@ -43,9 +43,9 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- compileOnly rootProject.ext.dependencies.kotlinstdlibjdk7
- compileOnly rootProject.ext.dependencies.androidxannotation
- compileOnly rootProject.ext.dependencies.material
+ implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+ implementation rootProject.ext.dependencies.androidxannotation
+ implementation rootProject.ext.dependencies.material
implementation rootProject.ext.dependencies.gson
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index b780448869..7bb26845fe 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -69,14 +69,19 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
*/
public void startVoicePad() {
try {
- if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
- Logger.d(TAG, "启动小智语音");
- Intent intent = new Intent();
- intent.setComponent(new ComponentName("com.zhidao.speech",
- "com.zhidao.speech.MainActivity"));
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- startActivity(intent);
- }
+ getWindow().getDecorView().postDelayed(new Runnable() {
+ @Override
+ public void run() {
+ if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
+ Logger.d(TAG, "启动小智语音");
+ Intent intent = new Intent();
+ intent.setComponent(new ComponentName("com.zhidao.speech",
+ "com.zhidao.speech.MainActivity"));
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ startActivity(intent);
+ }
+ }
+ }, 3000);
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
index 8a5ee424de..78d0c87cfe 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapProvider.java
@@ -59,6 +59,12 @@ public class SmallMapProvider implements IMogoSmallMapProvider, IMogoStatusChang
MogoServicePaths.PATH_SMALL_MAP,
StatusDescriptor.MAIN_PAGE_RESUME,
this);
+
+ if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+ showPanel();
+ } else {
+ hidePanel();
+ }
}
@Override
diff --git a/settings.gradle b/settings.gradle
index bce06e4d72..d37721996b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,6 +4,22 @@ include ':app'
// 应用主入口
include ':main-extensions:mogo-module-main-launcher'
+
+// 核心模块
+// 公用数据实体
+include ':core:mogo-core-data'
+// 公用资源
+include ':core:mogo-core-res'
+// 公用工具类
+include ':core:mogo-core-utils'
+// 功能定义接口
+include ':core:mogo-core-function-api'
+// 模块对外暴露等调用接口
+include ':core:mogo-core-function-call'
+// 业务实现
+include ':core:function-impl:mogo-core-function-hmi'
+
+
// 服务
include ':services:mogo-service-api'
include ':services:mogo-service'
@@ -19,15 +35,6 @@ include ':libraries:mogo-map-api'
include ':libraries:map-autonavi'
include ':libraries:mogo-map'
-// 核心模块
-include ':core:mogo-core-data'
-include ':core:mogo-core-utils'
-include ':core:mogo-core-function-api'
-include ':core:mogo-core-function-call'
-
-include ':core:function-impl:mogo-core-function-hmi'
-
-
// OLD业务模块
include ':modules:tanlulib'
include ':modules:mogo-module-obu-mogo'