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

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

Browse Source
This commit is contained in:
董宏宇
2020-09-16 20:26:32 +08:00
parent aed1fed2c4 49b9ffddb0
commit a8cb951b29
43 changed files with 132 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSurroundingAdapter.java
View File

@@ -191,10 +191,10 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
typeName = "封路";
break;
case MarkerPoiTypeEnum.FOURS_ICE:
typeName = "路面结冰";
typeName = "道路结冰";
break;
case MarkerPoiTypeEnum.FOURS_FOG:
typeName = "出现浓雾";
typeName = "浓雾";
break;
case MarkerPoiTypeEnum.TRAFFIC_CHECK:
typeName = "交通检查";
@@ -203,10 +203,10 @@ public class V2XSurroundingAdapter extends RecyclerView.Adapter<V2XSurroundingVi
typeName = "交通事故";
break;
case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
typeName = "道路拥堵";
typeName = "拥堵";
break;
case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
typeName = "道路施工";
typeName = "施工";
break;
case MarkerPoiTypeEnum.FOURS_PONDING:
typeName = "道路积水";

BIN
modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_surrounding_bottom_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

BIN
modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_surrounding_bottom_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 659 B

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi-1920x1000/v2x_surrounding_bottom_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_surrounding_bottom_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

4
modules/mogo-module-v2x/src/main/res/layout/module_event_panel_fragment_surrounding.xml
View File

@@ -22,14 +22,16 @@
android:layout_marginLeft="@dimen/module_v2x_surrounding_margin_left"
android:text="周围5公里，共15条交通信息"
android:textColor="@color/v2x_white"
android:layout_marginBottom="2px"
android:textSize="@dimen/module_v2x_surrounding_top_textsize" />
<!-- android:layout_centerInParent="true"-->
<TextView
android:id="@+id/tv_top_refresh"
android:layout_width="@dimen/module_v2x_surrounding_top_bt_width"
android:layout_height="@dimen/module_v2x_surrounding_top_bt_height"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_alignParentBottom="true"
android:layout_marginRight="@dimen/module_v2x_surrounding_margin_left"
android:background="@drawable/bg_v2x_refresh"
android:gravity="center"

4
modules/mogo-module-v2x/src/main/res/layout/module_fragment_surrounding_event_item.xml
View File

@@ -9,11 +9,11 @@
android:scaleType="fitXY"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<!-- android:src="@drawable/mogo_image_nongwu_nor"-->
<!-- android:src="@drawable/mogo_image_nongwu_nor" bg_v2x_event_surrounding_item_bottom-->
<RelativeLayout
android:layout_alignParentBottom="true"
android:background="@drawable/bg_v2x_event_surrounding_item_bottom"
android:background="@drawable/v2x_surrounding_bottom_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/module_v2x_surrounding_item_bottom">

6
modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
View File

@@ -39,10 +39,10 @@
<dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
<dimen name="module_v2x_surrounding_item_height">173px</dimen>
<dimen name="module_v2x_surrounding_item_height">170px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
<dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>

6
modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml
View File

@@ -23,7 +23,7 @@
<dimen name="module_v2x_history_event_icon_size">80px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">10px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
<dimen name="module_v2x_map_left">550px</dimen>
<dimen name="module_v2x_map_top">200px</dimen>
<dimen name="module_v2x_map_right">200px</dimen>
@@ -36,8 +36,8 @@
<dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
<dimen name="module_v2x_surrounding_item_height">306px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">77px</dimen>

6
modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
View File

@@ -24,7 +24,7 @@
<dimen name="module_v2x_history_event_icon_size">80px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">10px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_size">15px</dimen>
<dimen name="module_v2x_map_left">550px</dimen>
<dimen name="module_v2x_map_top">200px</dimen>
<dimen name="module_v2x_map_right">200px</dimen>
@@ -37,8 +37,8 @@
<dimen name="module_v2x_surrounding_empty_bt_width">270px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">86px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">58px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_margin_left">48px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">349px</dimen>
<dimen name="module_v2x_surrounding_item_height">306px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">77px</dimen>

6
modules/mogo-module-v2x/src/main/res/values/dimens.xml
View File

@@ -39,10 +39,10 @@
<dimen name="module_v2x_surrounding_empty_bt_width">150px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_height">48px</dimen>
<dimen name="module_v2x_surrounding_empty_bt_margin_top">32px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_margin_left">10px</dimen>
<dimen name="module_v2x_surrounding_root_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_margin_left">28px</dimen>
<dimen name="module_v2x_surrounding_empty_image_height">190px</dimen>
<dimen name="module_v2x_surrounding_item_height">173px</dimen>
<dimen name="module_v2x_surrounding_item_height">170px</dimen>
<dimen name="module_v2x_surrounding_item_bottom">43px</dimen>
<dimen name="module_v2x_surrounding_item_bottom_image_height">26px</dimen>
<dimen name="module_v2x_surrounding_item_marigin_left">12px</dimen>