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

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

Browse Source
This commit is contained in:
wangcongtao
2020-02-15 19:19:13 +08:00
parent 8620965bab 0b2e3b395e
commit bac6dba0b3
24 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java
View File

@@ -152,9 +152,9 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_green);
break;
default:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_green_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_green);
ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue);
break;
}
}

14
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java
View File

@@ -104,7 +104,7 @@ public class MapMarkerView extends MapMarkerBaseView {
break;
case MarkerPoiTypeEnum.ROAD_CLOSED:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_off);
ivBg.setImageResource(R.drawable.bg_map_marker_dark_blue);
ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);
break;
case MarkerPoiTypeEnum.SHOP_DISCOUNT:
ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount);
@@ -116,23 +116,23 @@ public class MapMarkerView extends MapMarkerBaseView {
break;
case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_work);
ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_blue);
ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);
break;
case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up);
ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue);
ivBg.setImageResource(R.drawable.bg_map_marker_blue);
break;
case MarkerPoiTypeEnum.FOURS_PONDING:
ivIcon.setImageResource(R.drawable.icon_map_marker_pondingl);
ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue);
ivBg.setImageResource(R.drawable.bg_map_marker_blue);
break;
case MarkerPoiTypeEnum.FOURS_SHOP_FREE:
ivIcon.setImageResource(R.drawable.icon_map_marker_shop);
ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_green);
ivBg.setImageResource(R.drawable.bg_map_marker_green_dark);
break;
default:
// ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);
// ivBg.setImageResource(R.drawable.bg_map_marker_green);
ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news);
ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);
break;
}
}