From 3a8f6df7f021a747512405e3ab9e325e56b33cdc Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Tue, 14 Jul 2020 09:42:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0em1,em3,em4=E6=B8=A0=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 41 +++++++++++++++++++++++++++++++-- app/src/em4/AndroidManifest.xml | 6 +++++ 2 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 app/src/em4/AndroidManifest.xml diff --git a/app/build.gradle b/app/build.gradle index 2718b5d308..91f3a5eb87 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,9 +63,12 @@ android { independent { manifest.srcFile 'src/independent/AndroidManifest.xml' } - e8xx { + e8xx{ manifest.srcFile 'src/e8xx/AndroidManifest.xml' } + em4 { + manifest.srcFile 'src/em4/AndroidManifest.xml' + } } flavorDimensions "product", "basic", "env" @@ -100,13 +103,34 @@ android { buildConfigField 'int', 'AIType','2' buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' } - // e系列 + // e系列,采用Launcher方案 e8xx { dimension "product" // 使用思必驰语音 buildConfigField 'int', 'AIType','2' buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' } + // 同上 + em4 { + dimension "product" + // 使用思必驰语音 + buildConfigField 'int', 'AIType','2' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' + } + // e系列-2+32,对标D系列2+32,采用独立app的形式 + em3 { + dimension "product" + // 使用思必驰语音 + buildConfigField 'int', 'AIType', '2' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' + } + // e系列-1+16,对标D系列1+16,采用独立app形式 + em1 { + dimension "product" + // 使用思必驰语音 + buildConfigField 'int', 'AIType', '2' + buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' + } // d系列 d8xx { dimension "product" @@ -220,14 +244,21 @@ dependencies { implementation rootProject.ext.dependencies.moduleservice // 事件面板分渠道引用 d82xImplementation rootProject.ext.dependencies.moduleventpanelnoop + em1Implementation rootProject.ext.dependencies.moduleventpanelnoop d8xxImplementation rootProject.ext.dependencies.moduleventpanel + em4Implementation rootProject.ext.dependencies.moduleventpanel e8xxImplementation rootProject.ext.dependencies.moduleventpanel f8xxImplementation rootProject.ext.dependencies.moduleventpanel + em3Implementation rootProject.ext.dependencies.moduleventpanel // 左侧面板分渠道引用 d82xImplementation rootProject.ext.dependencies.moduleleftpanel + em1Implementation rootProject.ext.dependencies.moduleleftpanel d8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop + em4Implementation rootProject.ext.dependencies.moduleleftpanelnoop + e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop f8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop + em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop } else { launcherImplementation project(':main-extensions:mogo-module-main-launcher') // launcherImplementation project(':modules:mogo-module-main') @@ -243,14 +274,20 @@ dependencies { implementation project(':modules:mogo-module-service') // 事件面板分渠道引用 d82xImplementation project(':modules:mogo-module-event-panel-noop') + em1Implementation project(':modules:mogo-module-event-panel-noop') d8xxImplementation project(':modules:mogo-module-event-panel') + em4Implementation project(':modules:mogo-module-event-panel') e8xxImplementation project(':modules:mogo-module-event-panel') f8xxImplementation project(':modules:mogo-module-event-panel') + em3Implementation project(':modules:mogo-module-event-panel') // 左侧面板分渠道引用 d82xImplementation project(':modules:mogo-module-left-panel') + em1Implementation project(':modules:mogo-module-left-panel') d8xxImplementation project(':modules:mogo-module-left-panel-noop') + em4Implementation project(':modules:mogo-module-left-panel-noop') e8xxImplementation project(':modules:mogo-module-left-panel-noop') f8xxImplementation project(':modules:mogo-module-left-panel-noop') + em3Implementation project(':modules:mogo-module-left-panel-noop') } } diff --git a/app/src/em4/AndroidManifest.xml b/app/src/em4/AndroidManifest.xml new file mode 100644 index 0000000000..d755054676 --- /dev/null +++ b/app/src/em4/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file