Merge remote-tracking branch 'origin/dev' into dev

app/build.gradle

@@ -385,6 +385,9 @@ 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
@@ -430,7 +433,6 @@ dependencies {
     apply from: "./functions/tts.gradle"
     apply from: "./functions/backwidget.gradle"
     apply from: "./functions/mediaui.gradle"
-    apply from: "./functions/bizcallchat.gradle"
     apply from: "./functions/bizguide.gradle"
 
 //    implementation group: "com.tencent.matrix", name: "matrix-android-lib", version: '0.6.6', changing: true

app/functions/bizcallchat.gradle

@@ -1,20 +0,0 @@
-// 引导模块：部分机型暂不需要引导模块
-
-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
-}

gradle.properties

@@ -129,7 +129,7 @@ TTS_NOOP_VERSION=2.0.7
 
 ######## 外部依赖引用
 # 车聊聊
-CARCHATTING_VERSION=1.6.5-SNAPSHOT
+CARCHATTING_VERSION=1.6.7-SNAPSHOT
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.1.7
 # loglib

modules/mogo-module-main/src/main/res/values/dimens.xml

@@ -34,5 +34,5 @@
     <dimen name="module_main_event_panel_fragment_paddingTop">2px</dimen>
     <dimen name="module_main_event_panel_fragment_paddingBottom">2px</dimen>
     <dimen name="module_main_event_panel_fragment_paddingLeft">0px</dimen>
-    <dimen name="module_main_event_panel_fragment_paddingRight">0px</dimen>
+    <dimen name="module_main_event_panel_fragment_paddingRight">6px</dimen>
 </resources>

modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml

@@ -12,7 +12,7 @@
         android:id="@+id/module_services_id_panel_item_avatar"
         android:layout_width="@dimen/module_services_panel_item_avatar_size"
         android:layout_height="@dimen/module_services_panel_item_avatar_size"
-        android:layout_marginStart="@dimen/dp_25"
+        android:layout_marginStart="@dimen/dp_24"
         android:src="@drawable/module_common_default_user_head"
         app:civ_border_color="@color/module_services_id_panel_item_avatar_border_color"
         app:civ_border_width="@dimen/module_services_id_panel_item_avatar_border_width"

modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml

@@ -45,7 +45,7 @@
     <dimen name="module_services_panel_item_distance_textSize">16px</dimen>
     <dimen name="module_services_panel_item_nickname_textSize">18px</dimen>
     <dimen name="module_services_id_panel_item_avatar_border_width">5px</dimen>
-    <dimen name="module_services_panel_item_padding">20px</dimen>
+    <dimen name="module_services_panel_item_padding">28px</dimen>
     <dimen name="module_services_panel_item_nickname_marginLeft">13px</dimen>
     <dimen name="module_services_id_panel_item_distance_marginLeft">42px</dimen>
     <dimen name="module_services_panel_item_detail_bkg_corner">8.89px</dimen>