yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/v1.0.2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.2

Browse Source
This commit is contained in:
wangcongtao
2020-03-25 09:54:34 +08:00
parent 81d3cbfac0 b6c919c3cf
commit d4566a4e99
10 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -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
# 推送

2
modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerCarInfo.java
View File

@@ -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

BIN
modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_car_gray.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

4
modules/mogo-module-service/src/main/res/layout/view_map_marker.xml
View File

@@ -55,8 +55,8 @@
<ImageView
android:id="@+id/ivCar"
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_64"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_map_marker_car_gray"
app:layout_constraintEnd_toEndOf="@+id/ivBg"
app:layout_constraintStart_toStartOf="@+id/ivBg"

4
modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml
View File

@@ -79,8 +79,8 @@
<ImageView
android:id="@+id/ivCar"
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_64"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_map_marker_car_gray"
android:translationY="-10dp" />
</LinearLayout >

9
modules/mogo-module-share/src/main/res/layout/launcher_dialog_share.xml
View File

@@ -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">
<ImageView
android:id="@+id/block_up_iv"
@@ -54,6 +55,7 @@
android:id="@+id/oil_price_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginLeft="@dimen/share_module_margin_left"
android:layout_toRightOf="@+id/btn_block_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">
<ImageView
android:id="@+id/traffic_check_iv"
@@ -136,7 +137,7 @@
android:layout_below="@+id/btn_block_layout"
android:layout_marginTop="@dimen/share_module_bottom_margin_top"
android:gravity="center"
android:text="可以对小智说：上报拥堵、分享油价、上报交通检查、上报封路"
android:text="可以对小智说：上报拥堵、上报交通检查、上报封路"
android:textColor="@color/white_40"
android:textSize="@dimen/share_module_bottom_size"
android:textStyle="bold" />

4
modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml
View File

@@ -5,8 +5,8 @@
<dimen name="share_module_height">320px</dimen>
<dimen name="share_module_margin_top">34px</dimen>
<dimen name="share_module_title_margin_top">43px</dimen>
<dimen name="share_module_first_margin_left">80px</dimen>
<dimen name="share_module_margin_left">64px</dimen>
<dimen name="share_module_first_margin_left">100px</dimen>
<dimen name="share_module_margin_left">118px</dimen>
<dimen name="share_module_tv_margin_top">15px</dimen>
<dimen name="share_module_image_width">85px</dimen>
<dimen name="share_module_image_width_second">110px</dimen>

4
modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml
View File

@@ -4,8 +4,8 @@
<dimen name="share_module_height">600px</dimen>
<dimen name="share_module_margin_top">64px</dimen>
<dimen name="share_module_title_margin_top">80px</dimen>
<dimen name="share_module_first_margin_left">150px</dimen>
<dimen name="share_module_margin_left">120px</dimen>
<dimen name="share_module_first_margin_left">200px</dimen>
<dimen name="share_module_margin_left">210px</dimen>
<dimen name="share_module_tv_margin_top">30px</dimen>
<dimen name="share_module_image_width">160px</dimen>
<dimen name="share_module_image_width_second">198px</dimen>

4
modules/mogo-module-share/src/main/res/values/dimens.xml
View File

@@ -4,8 +4,8 @@
<dimen name="share_module_height">600px</dimen>
<dimen name="share_module_margin_top">64px</dimen>
<dimen name="share_module_title_margin_top">80px</dimen>
<dimen name="share_module_first_margin_left">150px</dimen>
<dimen name="share_module_margin_left">120px</dimen>
<dimen name="share_module_first_margin_left">200px</dimen>
<dimen name="share_module_margin_left">210px</dimen>
<dimen name="share_module_tv_margin_top">30px</dimen>
<dimen name="share_module_image_width">160px</dimen>
<dimen name="share_module_image_width_second">198px</dimen>