diff --git a/app/build.gradle b/app/build.gradle index ed531a91d2..f7e1fb318a 100644 --- a/app/build.gradle +++ b/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 diff --git a/app/functions/bizcallchat.gradle b/app/functions/bizcallchat.gradle deleted file mode 100644 index 5dbdac4336..0000000000 --- a/app/functions/bizcallchat.gradle +++ /dev/null @@ -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 -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 52a9cbb446..3122fa68b7 100644 --- a/gradle.properties +++ b/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 diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index 9221b7081d..30f61f1985 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -34,5 +34,5 @@ 2px 2px 0px - 0px + 6px \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml b/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml index 6bc69fe366..577b0ba7d3 100644 --- a/modules/mogo-module-service/src/main/res/layout/module_services_online_car_panel_item.xml +++ b/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" diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml index a5a63b9493..aa8cf42951 100644 --- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml @@ -45,7 +45,7 @@ 16px 18px 5px - 20px + 28px 13px 42px 8.89px diff --git a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_ext_shadow_bkg_light.9.png b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_ext_shadow_bkg_light.9.png index e85f79b3e6..ad8e52773a 100644 Binary files a/skin/mogo-skin-light/src/main/module-common-res/drawable/module_ext_shadow_bkg_light.9.png and b/skin/mogo-skin-light/src/main/module-common-res/drawable/module_ext_shadow_bkg_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_online_car_panel_background_light.9.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_online_car_panel_background_light.9.png index 36ea7d6655..68f94c1278 100644 Binary files a/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_online_car_panel_background_light.9.png and b/skin/mogo-skin-light/src/main/module-services-res/drawable-ldpi/module_services_online_car_panel_background_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_online_car_panel_background_light.9.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_online_car_panel_background_light.9.png index 36ea7d6655..68f94c1278 100644 Binary files a/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_online_car_panel_background_light.9.png and b/skin/mogo-skin-light/src/main/module-services-res/drawable-mdpi/module_services_online_car_panel_background_light.9.png differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png b/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png deleted file mode 100644 index a676aad633..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-services-res/drawable-xhdpi/module_services_online_car_panel_background_light.9.png and /dev/null differ diff --git a/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_online_car_panel_background_light.9.png b/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_online_car_panel_background_light.9.png deleted file mode 100644 index 5ff5526ff8..0000000000 Binary files a/skin/mogo-skin-light/src/main/module-services-res/drawable/module_services_online_car_panel_background_light.9.png and /dev/null differ