diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ded1452284..3a0dd65790 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -29,6 +29,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3756f8c735..58a8fa2665 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -114,6 +114,13 @@ android {
buildConfigField 'int', 'AIType','1'
buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
}
+ // d系列 1+16 版本
+ d82x{
+ dimension "product"
+ // 使用同行者语音
+ buildConfigField 'int', 'AIType','1'
+ buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
+ }
qa {
dimension "env"
buildConfigField 'int', 'NET_ENV', '2'
@@ -210,7 +217,10 @@ dependencies {
releaseImplementation rootProject.ext.dependencies.gpssimulatornoop
implementation rootProject.ext.dependencies.modulemedia
implementation rootProject.ext.dependencies.moduleservice
- implementation rootProject.ext.dependencies.moduleventpanel
+ d82xImplementation rootProject.ext.dependencies.moduleventpanelnoop
+ d8xxImplementation rootProject.ext.dependencies.moduleventpanel
+ e8xxImplementation rootProject.ext.dependencies.moduleventpanel
+ f8xxImplementation rootProject.ext.dependencies.moduleventpanel
} else {
launcherImplementation project(':main-extensions:mogo-module-main-launcher')
// launcherImplementation project(':modules:mogo-module-main')
@@ -224,7 +234,10 @@ dependencies {
releaseImplementation project(':modules:mogo-module-gps-simulator-noop')
implementation project(':modules:mogo-module-media')
implementation project(':modules:mogo-module-service')
- implementation project(':modules:mogo-module-event-panel')
+ d82xImplementation project(':modules:mogo-module-event-panel-noop')
+ d8xxImplementation project(':modules:mogo-module-event-panel')
+ e8xxImplementation project(':modules:mogo-module-event-panel')
+ f8xxImplementation project(':modules:mogo-module-event-panel')
}
}
diff --git a/config.gradle b/config.gradle
index 68dbbc5268..eb29712af3 100644
--- a/config.gradle
+++ b/config.gradle
@@ -160,6 +160,8 @@ ext {
// obu sdk
obusdk : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.1",
//事件面板
- moduleventpanel : "com.mogo.module:module-event-panel:${MOGO_MODULE_EVENT_PANEL_VERSION}"
+ moduleventpanel : "com.mogo.module:module-event-panel:${MOGO_MODULE_EVENT_PANEL_VERSION}",
+ // 事件面板空实现
+ moduleventpanelnoop : "com.mogo.module:module-event-panel-noop:${MOGO_MODULE_EVENT_PANEL_VERSION}"
]
}
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel-noop/.gitignore b/modules/mogo-module-event-panel-noop/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/modules/mogo-module-event-panel-noop/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel-noop/build.gradle b/modules/mogo-module-event-panel-noop/build.gradle
new file mode 100644
index 0000000000..48c2ef759d
--- /dev/null
+++ b/modules/mogo-module-event-panel-noop/build.gradle
@@ -0,0 +1,55 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: '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")
+
+ javaCompileOptions {
+ annotationProcessorOptions {
+ arguments = [AROUTER_MODULE_NAME: project.getName()]
+ }
+ }
+
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ consumerProguardFiles 'consumer-rules.pro'
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+
+ compileOptions {
+ targetCompatibility 1.8
+ sourceCompatibility 1.8
+ }
+
+}
+
+dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation rootProject.ext.dependencies.androidxccorektx
+ implementation rootProject.ext.dependencies.kotlinstdlibjdk7
+ implementation rootProject.ext.dependencies.androidxappcompat
+ implementation rootProject.ext.dependencies.arouter
+ kapt rootProject.ext.dependencies.aroutercompiler
+
+ if (Boolean.valueOf(RELEASE)) {
+ compileOnly rootProject.ext.dependencies.modulecommon
+ } else {
+ compileOnly project(':modules:mogo-module-common')
+ }
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-event-panel-noop/consumer-rules.pro b/modules/mogo-module-event-panel-noop/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/mogo-module-event-panel-noop/gradle.properties b/modules/mogo-module-event-panel-noop/gradle.properties
new file mode 100644
index 0000000000..df90d55670
--- /dev/null
+++ b/modules/mogo-module-event-panel-noop/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-event-panel-noop
+VERSION_CODE=1
diff --git a/modules/mogo-module-event-panel-noop/proguard-rules.pro b/modules/mogo-module-event-panel-noop/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/modules/mogo-module-event-panel-noop/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/modules/mogo-module-event-panel-noop/src/androidTest/java/com/zhidao/mogo/module/event/panel/ExampleInstrumentedTest.kt b/modules/mogo-module-event-panel-noop/src/androidTest/java/com/zhidao/mogo/module/event/panel/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000000..6a8c2bfcea
--- /dev/null
+++ b/modules/mogo-module-event-panel-noop/src/androidTest/java/com/zhidao/mogo/module/event/panel/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package com.zhidao.mogo.module.event.panel
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+ @Test
+ fun useAppContext() {
+ // Context of the app under test.
+ val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+ assertEquals("com.zhidao.mogo.module.event.panel.test", appContext.packageName)
+ }
+}
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel-noop/src/main/AndroidManifest.xml b/modules/mogo-module-event-panel-noop/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..c865fb2efe
--- /dev/null
+++ b/modules/mogo-module-event-panel-noop/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+
+
+ /
+
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel-noop/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.kt b/modules/mogo-module-event-panel-noop/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.kt
new file mode 100644
index 0000000000..dc22fdbc7a
--- /dev/null
+++ b/modules/mogo-module-event-panel-noop/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelConstants.kt
@@ -0,0 +1,11 @@
+package com.zhidao.mogo.module.event.panel
+
+/**
+ * 事件面板相关常量
+ *
+ * @author tongchenfei
+ */
+object EventPanelConstants {
+ const val MODULE_NAME = "MODULE_EVENT_PANEL"
+ const val PATH_NAME = "/event/panel"
+}
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel-noop/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.kt b/modules/mogo-module-event-panel-noop/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.kt
new file mode 100644
index 0000000000..a8ecade4c8
--- /dev/null
+++ b/modules/mogo-module-event-panel-noop/src/main/java/com/zhidao/mogo/module/event/panel/EventPanelModuleProvider.kt
@@ -0,0 +1,90 @@
+package com.zhidao.mogo.module.event.panel
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.map.listener.IMogoMapListener
+import com.mogo.map.location.IMogoLocationListener
+import com.mogo.map.marker.IMogoMarkerClickListener
+import com.mogo.map.navi.IMogoNaviListener
+import com.mogo.service.MogoServicePaths
+import com.mogo.service.eventpanel.IEventPanelProvider
+import com.mogo.service.module.IMogoModuleLifecycle
+import com.mogo.utils.logger.Logger
+import com.zhidao.mogo.module.event.panel.EventPanelConstants.MODULE_NAME
+
+/**
+ * 事件面板provider的空方法实现
+ *
+ * @author tongchenfei
+ */
+
+
+const val TAG = "EventPanelNoopModule"
+
+@Route(path = MogoServicePaths.PATH_EVENT_PANEL)
+class EventPanelModuleProvider : IEventPanelProvider {
+ override fun init(context: Context) {
+ Logger.d(TAG, "模块初始化====")
+ }
+
+ override fun createFragment(context: Context, data: Bundle?): Fragment? {
+ return null
+ }
+
+ /**
+ * 显示面板
+ */
+ override fun showPanel() {
+ }
+
+
+ /**
+ * 隐藏面板
+ */
+ override fun hidePanel() {
+ }
+
+ override fun createView(context: Context): View? {
+ return null
+ }
+
+ override fun getModuleName(): String {
+ return MODULE_NAME
+ }
+
+ override fun getCardLifecycle(): IMogoModuleLifecycle? {
+ return null
+ }
+
+ override fun getMapListener(): IMogoMapListener? {
+ return null
+ }
+
+ override fun getType(): Int {
+ return 0
+ }
+
+ override fun getNaviListener(): IMogoNaviListener? {
+ return null
+ }
+
+ override fun getLocationListener(): IMogoLocationListener? {
+ return null
+ }
+
+ override fun getMarkerClickListener(): IMogoMarkerClickListener? {
+ return null
+ }
+
+ override fun getAppPackage(): String? {
+ return null
+ }
+
+ override fun getAppName(): String? {
+ return null
+ }
+
+}
\ No newline at end of file
diff --git a/modules/mogo-module-event-panel-noop/src/test/java/com/zhidao/mogo/module/event/panel/ExampleUnitTest.kt b/modules/mogo-module-event-panel-noop/src/test/java/com/zhidao/mogo/module/event/panel/ExampleUnitTest.kt
new file mode 100644
index 0000000000..f41429e9e1
--- /dev/null
+++ b/modules/mogo-module-event-panel-noop/src/test/java/com/zhidao/mogo/module/event/panel/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package com.zhidao.mogo.module.event.panel
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+ @Test
+ fun addition_isCorrect() {
+ assertEquals(4, 2 + 2)
+ }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index a9c8e42ce0..31a80bb74e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
+include ':modules:mogo-module-event-panel-noop'
include ':modules:mogo-module-event-panel'
include ':modules:mogo-module-obu'
rootProject.name = 'MogoLauncher'
diff --git a/upload.sh b/upload.sh
index 97ca032064..172d77721e 100755
--- a/upload.sh
+++ b/upload.sh
@@ -27,5 +27,6 @@
./gradlew :modules:mogo-module-guide:clean :modules:mogo-module-guide:uploadArchives
./gradlew :main-extensions:mogo-module-main-independent:clean :main-extensions:mogo-module-main-independent:uploadArchives
./gradlew :main-extensions:mogo-module-main-launcher:clean :main-extensions:mogo-module-main-launcher:uploadArchives
-
+./gradlew :modules:mogo-module-event-panel:clean :modules:mogo-module-event-panel:uploadArchives
+./gradlew :modules:mogo-module-event-panel-noop:clean :modules:mogo-module-event-panel-noop:uploadArchives