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

2020-12-01 14:45:22 +08:00
parent daaf2fe35c baeea67314
commit e7d84bdc5d
7 changed files with 9 additions and 1 deletions
--- a/gradle.properties
+++ b/gradle.properties
@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7

 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=1.9.3
+CARCHATTING_VERSION=1.9.7
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.7
 # loglib
--- 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.9.png
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/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.xml
+++ b/skin/mogo-skin-light/src/main/module-callchat-res/drawable/module_carchatting_launcher_calling_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_30" />
+    <gradient
+        android:angle="180"
+        android:endColor="#1AF5F5F5"
+        android:startColor="#F5F5F5" />
+</shape>
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_normal_light.png
--- a/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_select_light.png
+++ b/skin/mogo-skin-light/src/main/module-v2x-res/drawable/v2x_nav_select_light.png