diff --git a/gradle.properties b/gradle.properties index 06af0eb8b8..e93a3715c4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -56,7 +56,7 @@ CARCHATTINGPROVIDER_VERSION=1.0.2.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.1-SNAPSHOT # v2x -MOGO_MODULE_V2X_VERSION=1.0.2-SNAPSHOT +MOGO_MODULE_V2X_VERSION=1.0.3-SNAPSHOT # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.1-SNAPSHOT # 推送 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java index 47041c1f5e..da1934a703 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java @@ -52,7 +52,7 @@ public class MarkerCarInfo implements Serializable { this.carLiveInfo = carLiveInfo; } - class CarLiveInfo implements Serializable { + public static class CarLiveInfo implements Serializable { //rtmp视频直播地址rtmp:// private String videoUrl; //直播频道【直播心跳接口参数】C_1 diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_gray.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_gray.png old mode 100755 new mode 100644 index 4813a5df5d..ed4058f51a Binary files a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_gray.png and b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_gray.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png index eed1fca00c..d4266a6bc5 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png differ diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index dd210ad9b9..b37be6dc5d 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -55,8 +55,8 @@ diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml index 25151ea2a7..e38447d88a 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml @@ -29,7 +29,8 @@ android:id="@+id/btn_block_layout" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/share_module_first_margin_left"> + android:layout_marginEnd="@dimen/share_module_margin_left" + android:layout_toLeftOf="@+id/traffic_check_layout"> @@ -80,8 +82,7 @@ android:id="@+id/traffic_check_layout" android:layout_width="@dimen/share_module_image_width_second" android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/share_module_margin_left" - android:layout_toRightOf="@+id/oil_price_layout"> + android:layout_centerHorizontal="true"> diff --git a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml index dda7550e62..d28bf549bd 100644 --- a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml @@ -5,8 +5,8 @@ 320px 34px 43px - 80px - 64px + 100px + 118px 15px 85px 110px diff --git a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml index 1e9163fec3..ba3a919930 100644 --- a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml @@ -4,8 +4,8 @@ 600px 64px 80px - 150px - 120px + 200px + 210px 30px 160px 198px diff --git a/modules/mogo-module-share/src/main/res/values/dimens.xml b/modules/mogo-module-share/src/main/res/values/dimens.xml index 1e9163fec3..ba3a919930 100644 --- a/modules/mogo-module-share/src/main/res/values/dimens.xml +++ b/modules/mogo-module-share/src/main/res/values/dimens.xml @@ -4,8 +4,8 @@ 600px 64px 80px - 150px - 120px + 200px + 210px 30px 160px 198px