diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java index f10ef4d247..1b905d3f87 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java @@ -73,7 +73,7 @@ public class MarkerServiceHandler { for (int i = 0; i < 10; i++) { MogoMarkerOptions options = new MogoMarkerOptions() .owner(TAG) - .latitude(39.974525d + new Random().nextDouble()) + .latitude(37.974525d + new Random().nextDouble()) .longitude(116.41733d + new Random().nextDouble()); if (i % 2 == 0) { options.icon(mapMarkerInfoView); 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 4e2d773096..97223ecf63 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 @@ -6,6 +6,7 @@ import android.view.LayoutInflater; import android.widget.LinearLayout; import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.module.service.R; @@ -16,7 +17,7 @@ import com.mogo.module.service.R; * desc : 地图Marker图标带文本信息 * version: 1.0 */ -public class MapMarkerInfoView extends LinearLayout { +public class MapMarkerInfoView extends ConstraintLayout { public MapMarkerInfoView(Context context) { super(context); initView(context); 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 d288cfa493..4663420ddf 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 @@ -3,9 +3,9 @@ package com.mogo.module.service.marker; import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; -import android.widget.LinearLayout; import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; import com.mogo.module.service.R; @@ -16,7 +16,7 @@ import com.mogo.module.service.R; * desc : 地图Marker图标 * version: 1.0 */ -public class MapMarkerView extends LinearLayout { +public class MapMarkerView extends ConstraintLayout { public MapMarkerView(Context context) { super(context); initView(context); diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_blue.png new file mode 100644 index 0000000000..0bd9d83a57 Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_blue.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png new file mode 100644 index 0000000000..37eae8f2ab Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_car_gray.png differ diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_blue.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_blue.png new file mode 100644 index 0000000000..34823616ee Binary files /dev/null and b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_location_blue.png differ 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 8926a9e9c0..b752a1633a 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 @@ -12,6 +12,4 @@ - - 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 c831059662..0d3b1ffbe3 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,9 +1,11 @@ - + android:orientation="vertical" + tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" > @@ -27,4 +28,14 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - \ 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 c4e0a7e62c..48b96abba9 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,32 +1,66 @@ - + android:orientation="horizontal" + tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" > - + app:layout_constraintTop_toTopOf="parent" > + + + + + + - \ No newline at end of file + app:layout_constraintEnd_toEndOf="@+id/llMarkerContent" + app:layout_constraintStart_toStartOf="@+id/llMarkerContent" + app:layout_constraintTop_toBottomOf="@+id/llMarkerContent" /> + + + \ No newline at end of file