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

2020-12-02 09:52:54 +08:00
parent bb6491bf7a 744a921e4c
commit dc7c1eff4f
9 changed files with 2 additions and 1 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7

 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=2.0.4
+CARCHATTING_VERSION=2.0.9
 # 车聊聊接口
 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-ldpi/module_carchatting_team_fragment_close_normal_light.png
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_fragment_close_normal_light.png
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_fragment_close_pressed_light.png
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_fragment_close_pressed_light.png
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_invitation_head_default_light.png
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-ldpi/module_carchatting_team_invitation_head_default_light.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-xhdpi/module_carchatting_launcher_calling_bg_light.9.png
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable-xhdpi/module_carchatting_launcher_calling_bg_light.9.png
--- a/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light_bak.xml
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_bg_light_bak.xml
--- a/skin/mogo-skin-light/src/main/module-callchat-res/values/colors.xml
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/values/colors.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <color name="module_carchatting_nick_color_light">#333333</color>
+    <color name="module_carchatting_white_color_light">#333333</color>
    <color name="module_carchatting_status_color_light">#999999</color>

    <color name="module_carchatting_user_call_light">#333333</color>