From 75a7d573209e7d46edf3fcbca55c99f0c80bc296 Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Wed, 25 Nov 2020 11:49:27 +0800
Subject: [PATCH] remove origin callchatting and replace by callchat

---
 .idea/gradle.xml                 |  1 -
 app/build.gradle                 |  3 ---
 app/functions/bizcallchat.gradle | 20 ++++++++++++++++++++
 config.gradle                    |  6 ++----
 gradle.properties                |  4 ++--
 5 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 app/functions/bizcallchat.gradle

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index b59a552525..8e9756d758 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -77,7 +77,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index f7e1fb318a..01b7631732 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -385,9 +385,6 @@ dependencies {
     debugImplementation rootProject.ext.dependencies.debugleakcanary
     releaseImplementation rootProject.ext.dependencies.releaseleakcanary
 
-    implementation rootProject.ext.dependencies.callchatprovider
-    implementation rootProject.ext.dependencies.callchat
-
     implementation rootProject.ext.dependencies.mogologlib
     compileOnly rootProject.ext.dependencies.adasapi
     compileOnly rootProject.ext.dependencies.adasconfigapi
diff --git a/app/functions/bizcallchat.gradle b/app/functions/bizcallchat.gradle
new file mode 100644
index 0000000000..5dbdac4336
--- /dev/null
+++ b/app/functions/bizcallchat.gradle
@@ -0,0 +1,20 @@
+// 引导模块：部分机型暂不需要引导模块
+
+project.dependencies {
+        bydautoImplementation rootProject.ext.dependencies.callchat
+        bydautoImplementation rootProject.ext.dependencies.callchatprovider
+        d8xxImplementation rootProject.ext.dependencies.callchat
+        d8xxImplementation rootProject.ext.dependencies.callchatprovider
+        d80xImplementation rootProject.ext.dependencies.callchat
+        d80xImplementation rootProject.ext.dependencies.callchatprovider
+        em4Implementation rootProject.ext.dependencies.callchat
+        em4Implementation rootProject.ext.dependencies.callchatprovider
+        e8xxImplementation rootProject.ext.dependencies.callchat
+        e8xxImplementation rootProject.ext.dependencies.callchatprovider
+        f8xxImplementation rootProject.ext.dependencies.callchat
+        f8xxImplementation rootProject.ext.dependencies.callchatprovider
+        f80xImplementation rootProject.ext.dependencies.callchat
+        f80xImplementation rootProject.ext.dependencies.callchatprovider
+        em3Implementation rootProject.ext.dependencies.callchat
+        em3Implementation rootProject.ext.dependencies.callchatprovider
+}
\ No newline at end of file
diff --git a/config.gradle b/config.gradle
index e179e0322a..a33d074f2e 100644
--- a/config.gradle
+++ b/config.gradle
@@ -104,10 +104,8 @@ ext {
             moduleapps                 : "com.mogo.module:module-apps:${MOGO_MODULE_APPS_VERSION}",
             mogoconnection             : "com.mogo.connection:mogo-connection:${MOGO_CONNECTION_VERSION}",
             moduleextensions           : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}",
-            carcall                    : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}",
-            carcallprovider            : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
-            callchat                   : "com.mogo.module.carchatout:module-carchatting:1.6.4-SNAPSHOT",
-            callchatprovider           : "com.mogo.module.carchatout:module-carchatting-provider:1.1.7",
+            callchat                   : "com.mogo.module.carchatout:module-carchatting:${CARCHATTING_VERSION}",
+            callchatprovider           : "com.mogo.module.carchatout:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
 
             guideshow                  : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDESHOW_VERSION}",
             // V2X
diff --git a/gradle.properties b/gradle.properties
index acaee21dcb..52a9cbb446 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -129,9 +129,9 @@ TTS_NOOP_VERSION=2.0.7
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.0.2
+CARCHATTING_VERSION=1.6.5-SNAPSHOT
 # 车聊聊接口
-CARCHATTINGPROVIDER_VERSION=1.4.1
+CARCHATTINGPROVIDER_VERSION=1.1.7
 # loglib
 LOGLIB_VERSION = 1.0.4