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

解决BUG

Browse Source 
【新鲜事】地图poi点绘制与设计图不一致
http://jira.zhidaohulian.com/projects/UI/issues/UI-268?filter=allopenissues
This commit is contained in:
董宏宇
2020-02-13 18:22:11 +08:00
parent 5859fb54d4
commit 302bb2512d
18 changed files with 121 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,10 +122,34 @@ public class MapMarkerInfoView extends MapMarkerBaseView {
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue);
break;
case MarkerPoiTypeEnum.SHOP_DISCOUNT:
ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red);
break;
case MarkerPoiTypeEnum.FOURS_SHOP:
case MarkerPoiTypeEnum.FOURS_4S:
ivIcon.setImageResource(R.drawable.icon_map_marker_4s);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue);
break;
case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_work);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue);
break;
case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue);
break;
case MarkerPoiTypeEnum.FOURS_PONDING:
ivIcon.setImageResource(R.drawable.icon_map_marker_pondingl);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue);
break;
case MarkerPoiTypeEnum.FOURS_SHOP_FREE:
ivIcon.setImageResource(R.drawable.icon_map_marker_shop);
clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_green_info);
ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_green);
break;
default:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);

4
modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
View File

@@ -167,7 +167,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
case MarkerPoiTypeEnum.SHOP_DISCOUNT:
properties.put("type", 9);
break;
case MarkerPoiTypeEnum.FOURS_SHOP:
case MarkerPoiTypeEnum.FOURS_4S:
properties.put("type", 10);
break;
}
@@ -404,7 +404,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag
case MarkerPoiTypeEnum.SHOP_DISCOUNT:
num_shop_discount++;
break;
case MarkerPoiTypeEnum.FOURS_SHOP:
case MarkerPoiTypeEnum.FOURS_4S:
num_fours_shop++;
break;
}

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

@@ -45,7 +45,7 @@ public class MapMarkerView extends MapMarkerBaseView {
public MapMarkerView(Context context, MarkerShowEntity markerShowEntity, MogoMarkerOptions options) {
super(context);
mOptions=options;
mOptions = options;
updateView(markerShowEntity);
}
@@ -108,10 +108,28 @@ public class MapMarkerView extends MapMarkerBaseView {
ivBg.setImageResource(R.drawable.bg_map_marker_dark_blue);
break;
case MarkerPoiTypeEnum.SHOP_DISCOUNT:
ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount);
ivBg.setImageResource(R.drawable.bg_map_marker_red);
break;
case MarkerPoiTypeEnum.FOURS_SHOP:
case MarkerPoiTypeEnum.FOURS_4S:
ivIcon.setImageResource(R.drawable.icon_map_marker_4s);
ivBg.setImageResource(R.drawable.bg_map_marker_blue);
break;
case MarkerPoiTypeEnum.FOURS_ROAD_WORK:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_work);
ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_blue);
break;
case MarkerPoiTypeEnum.FOURS_BLOCK_UP:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up);
ivBg.setBackgroundResource(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);
break;
case MarkerPoiTypeEnum.FOURS_SHOP_FREE:
ivIcon.setImageResource(R.drawable.icon_map_marker_shop);
ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_green);
break;
default:
ivIcon.setImageResource(R.drawable.icon_map_marker_road_check);