Merge remote-tracking branch 'origin/qa_1.1.8' into qa_1.1.8

2020-12-02 17:12:07 +08:00
parent 88382b8b5a a73252c90d
commit 48d9cc33ef
5 changed files with 10 additions and 1 deletions
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -74,6 +74,7 @@
          </set>
        </option>
        <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/gradle.properties
+++ b/gradle.properties
@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7

 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.0.9
+CARCHATTING_VERSION=2.1.6
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.7
 # loglib
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_launcher_calling_bg_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_launcher_calling_bg_light.9.png
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-mdpi/module_carchatting_launcher_calling_bg_light.9.png
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_follower_bg_light.xml
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_team_teammate_follower_bg_light.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="@dimen/dp_11" />
+    <gradient
+        android:angle="180"
+        android:endColor="#C6C6C6"
+        android:startColor="#C6C6C6" />
+</shape>