diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java index 5045d0d203..43e0a20977 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java @@ -17,5 +17,13 @@ public interface MarkerPoiTypeEnum { //商场打折 public String SHOP_DISCOUNT = "10004"; //4S店 - public String FOURS_SHOP = "10005"; + public String FOURS_4S = "10005"; + //施工 + public String FOURS_ROAD_WORK = "10006"; + //拥堵 + public String FOURS_BLOCK_UP = "10007"; + //积水 + public String FOURS_PONDING = "10008"; + //超市打折 + public String FOURS_SHOP_FREE = "10009"; } \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java index d0d225b4fb..aaa63c8edb 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java @@ -5,6 +5,7 @@ import android.graphics.Bitmap; import android.text.TextUtils; import android.util.AttributeSet; import android.widget.ImageView; +import android.widget.LinearLayout; import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; @@ -25,7 +26,7 @@ import com.mogo.utils.logger.Logger; * desc : 地图上抽离的Marker的共性 * version: 1.0 */ -public abstract class MapMarkerBaseView extends ConstraintLayout { +public abstract class MapMarkerBaseView extends LinearLayout { private String TAG = "MapMarkerBaseView"; protected Context mContext; 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 d6237fd22b..1912d00ff5 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 @@ -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); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 3a9f2e0340..c3c47e28d5 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -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; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 6043598951..5a72bf418d 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -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); } @@ -90,7 +90,6 @@ public class MapMarkerView extends MapMarkerBaseView { ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); - ivBg.setImageResource(R.drawable.bg_map_marker_green); ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); if (bindObj instanceof MarkerNoveltyInfo) { @@ -108,14 +107,32 @@ 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); - ivBg.setImageResource(R.drawable.bg_map_marker_green); +// ivIcon.setImageResource(R.drawable.icon_map_marker_road_check); +// ivBg.setImageResource(R.drawable.bg_map_marker_green); break; } } diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png new file mode 100644 index 0000000000..09788c99bf Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_red.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_red.png new file mode 100644 index 0000000000..ac52be9b9b Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_red.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_4s.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_4s.png new file mode 100644 index 0000000000..11c5c6ea7b Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_4s.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png new file mode 100644 index 0000000000..fc3ff86372 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png index cbe3fe5b66..29fd407dca 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png index 1a86fe5896..7f8f80be69 100644 Binary files a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_check.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png new file mode 100644 index 0000000000..0b0d4bbab5 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop.png new file mode 100644 index 0000000000..d8be56fd47 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png new file mode 100644 index 0000000000..97e8a4967b Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml new file mode 100644 index 0000000000..2573e98bc5 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml new file mode 100644 index 0000000000..3a95793bae --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml index b752a1633a..ae2ee542cc 100644 --- a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml @@ -8,6 +8,8 @@ android:pivotY="15%" android:toDegrees="45" > + diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml new file mode 100644 index 0000000000..d1dc477344 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml new file mode 100644 index 0000000000..3fd0165fc5 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml b/modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml new file mode 100644 index 0000000000..bdb5fb7337 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml @@ -0,0 +1,9 @@ + + + diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index cc0f489a99..52a06b7549 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -1,12 +1,58 @@ - + + + + + + + + + + - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml index ae9abe9dfe..e5fa9b4e91 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml @@ -1,26 +1,19 @@ - - - - + app:layout_constraintTop_toBottomOf="@+id/clMarkerContent" > + - \ No newline at end of file + + + + \ No newline at end of file