diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index d5195bf069..5cde04fe27 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -13,16 +13,12 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.map.marker.MogoMarkerOptions; import com.mogo.module.common.entity.MarkerExploreWay; -import com.mogo.module.common.entity.MarkerNoveltyInfo; -import com.mogo.module.common.entity.MarkerOnlineCar; import com.mogo.module.common.entity.MarkerPoiTypeEnum; import com.mogo.module.common.entity.MarkerShareMusic; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.service.R; import com.mogo.module.service.ServiceConst; -import java.util.Random; - /** * author : donghongyu * e-mail : 1358506549@qq.com @@ -94,10 +90,10 @@ public class MapMarkerInfoView extends MapMarkerBaseView { ivIcon.setImageResource( R.drawable.icon_map_marker_refuel ); break; case MarkerPoiTypeEnum.TRAFFIC_CHECK: - ivIcon.setImageResource( R.drawable.icon_map_marker_road_check2_light ); + ivIcon.setImageResource( R.drawable.icon_map_marker_road_check2_white ); break; case MarkerPoiTypeEnum.ROAD_CLOSED: - ivIcon.setImageResource( R.drawable.icon_map_marker_road_block_off2_light ); + ivIcon.setImageResource( R.drawable.icon_map_marker_road_block_off2_white ); break; case MarkerPoiTypeEnum.SHOP_DISCOUNT: ivIcon.setImageResource( R.drawable.icon_map_marker_shop_discount ); @@ -106,40 +102,40 @@ public class MapMarkerInfoView extends MapMarkerBaseView { ivIcon.setImageResource( R.drawable.icon_map_marker_4s ); break; case MarkerPoiTypeEnum.FOURS_ROAD_WORK: - ivIcon.setImageResource( R.drawable.icon_map_marker_road_work2_light ); + ivIcon.setImageResource( R.drawable.icon_map_marker_road_work2_white ); break; case MarkerPoiTypeEnum.FOURS_BLOCK_UP: - ivIcon.setImageResource( R.drawable.icon_map_marker_road_block_up2_light ); + ivIcon.setImageResource( R.drawable.icon_map_marker_road_block_up2_white ); break; case MarkerPoiTypeEnum.FOURS_PONDING: - ivIcon.setImageResource( R.drawable.icon_map_marker_pondingl2_light ); + ivIcon.setImageResource( R.drawable.icon_map_marker_pondingl2_white ); break; case MarkerPoiTypeEnum.FOURS_SHOP_FREE: ivIcon.setImageResource( R.drawable.icon_map_marker_shop ); break; case MarkerPoiTypeEnum.FOURS_FOG: - ivIcon.setImageResource( R.drawable.module_service_ic_rc_dark_frog2_light ); + ivIcon.setImageResource( R.drawable.module_service_ic_rc_dark_frog2_white ); break; case MarkerPoiTypeEnum.FOURS_ICE: - ivIcon.setImageResource( R.drawable.module_service_ic_rc_freeze2_light ); + ivIcon.setImageResource( R.drawable.module_service_ic_rc_freeze2_white ); break; case MarkerPoiTypeEnum.FOURS_PARKING: ivIcon.setImageResource( R.drawable.module_service_ic_rc_parking2 ); break; case MarkerPoiTypeEnum.FOURS_ACCIDENT: - ivIcon.setImageResource( R.drawable.module_service_ic_rc_accident3_light ); + ivIcon.setImageResource( R.drawable.module_service_ic_rc_accident3_white ); break; case MarkerPoiTypeEnum.FOURS_NEALY: ivIcon.setImageResource( R.drawable.icon_map_marker_shear_news ); break; case MarkerPoiTypeEnum.FOURS_LIVING: - ivIcon.setImageResource( R.drawable.icon_map_marker_living_light ); + ivIcon.setImageResource( R.drawable.icon_map_marker_living_white ); break; case MarkerPoiTypeEnum.ILLEGAL_PARK_LIVING: - ivIcon.setImageResource( R.drawable.module_service_ic_rc_illegal_park_light ); + ivIcon.setImageResource( R.drawable.module_service_ic_rc_illegal_park_white ); break; default: - ivIcon.setImageResource( R.drawable.icon_map_marker_road_block_up2_light ); + ivIcon.setImageResource( R.drawable.icon_map_marker_road_block_up2_white ); break; } } diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_living_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_pondingl2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_off2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_block_up2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_check2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/icon_map_marker_road_work2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_accident3_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_dark_frog2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_freeze2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park_light.png b/modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park_light.png rename to modules/mogo-module-service/src/main/res/drawable-ldpi/module_service_ic_rc_illegal_park_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_living_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_pondingl2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_off2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_up2_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_up2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_up2_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_block_up2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_check2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/icon_map_marker_road_work2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_accident3_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_dark_frog2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_freeze2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park_light.png b/modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park_light.png rename to modules/mogo-module-service/src/main/res/drawable-mdpi/module_service_ic_rc_illegal_park_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_living_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_off2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_accident3_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_dark_frog2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_freeze2_white.png diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_light.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_white.png similarity index 100% rename from modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_light.png rename to modules/mogo-module-service/src/main/res/drawable-xhdpi/module_service_ic_rc_illegal_park_white.png