From c7cd1641e1bea5c0976268769e1ef23bdd62b882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 13 Jan 2020 12:50:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84marker=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/MarkerServiceHandler.java | 4 ++-- .../service/marker/MapMarkerInfoView.java | 4 +++- .../module/service/marker/MapMarkerView.java | 18 ++++++++++++++++++ .../bg_shape_reverse_triangle_purple.xml | 2 +- .../main/res/layout/view_map_marker_info.xml | 4 ++-- 5 files changed, 26 insertions(+), 6 deletions(-) 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 f26baef41e..8f028d3bd1 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 @@ -136,7 +136,7 @@ public class MarkerServiceHandler { lastMarkerShowEntity.setChecked(false); drawMapMarker(lastMarkerShowEntity); - lastMarker.destroy(); + lastMarker.remove(); } // 将当前的Marker设置为选中 @@ -147,7 +147,7 @@ public class MarkerServiceHandler { lastMarker = drawMapMarker(markerShowEntity); - marker.destroy(); + marker.remove(); return false; } } 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 79119f8139..e379d4fc47 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 @@ -73,8 +73,10 @@ public class MapMarkerInfoView extends MapMarkerBaseView { if (bindObj instanceof MarkerOnlineCar) { if (((MarkerOnlineCar) bindObj).getUserInfo().getGenderValue() == 0) { llMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue); } else { llMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_purple_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_purple); } } break; @@ -85,7 +87,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView { .CARD_TYPE_SHARE_MUSIC: ivIconForeground.setVisibility(View.VISIBLE); llMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_purple_info); - + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_purple); 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 39230dae48..5a4c1e7e42 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 @@ -4,9 +4,11 @@ import android.content.Context; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; +import android.widget.ImageView; import androidx.annotation.Nullable; +import com.mogo.module.common.entity.MarkerOnlineCar; import com.mogo.module.common.entity.MarkerShowEntity; import com.mogo.module.service.R; import com.mogo.module.service.ServiceConst; @@ -21,6 +23,8 @@ import com.mogo.module.service.ServiceConst; public class MapMarkerView extends MapMarkerBaseView { private String TAG = "MapMarkerView"; + private ImageView ivBg; + public MapMarkerView(Context context) { super(context); } @@ -45,22 +49,36 @@ public class MapMarkerView extends MapMarkerBaseView { ivUserHead = findViewById(R.id.ivUserHead); ivIconForeground = findViewById(R.id.ivIconForeground); ivCar = findViewById(R.id.ivCar); + ivBg = findViewById(R.id.ivBg); } public void updateView(MarkerShowEntity markerShowEntity) { try { + Object bindObj = markerShowEntity.getBindObj(); + switch (markerShowEntity.getMarkerType()) { case ServiceConst .CARD_TYPE_CARS_CHATTING: + ivIconForeground.setVisibility(View.GONE); case ServiceConst .CARD_TYPE_USER_DATA: ivIconForeground.setVisibility(View.GONE); + + if (bindObj instanceof MarkerOnlineCar) { + if (((MarkerOnlineCar) bindObj).getUserInfo().getGenderValue() == 0) { + ivBg.setImageResource(R.drawable.bg_map_marker_blue); + } else { + ivBg.setImageResource(R.drawable.bg_map_marker_purple); + } + } break; case ServiceConst .CARD_TYPE_ROAD_CONDITION: + break; case ServiceConst .CARD_TYPE_SHARE_MUSIC: ivIconForeground.setVisibility(View.VISIBLE); + ivBg.setImageResource(R.drawable.bg_map_marker_purple); break; } ivCar.setRotation(markerShowEntity.getMarkerLocation().getAngle()); diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml index 125579bde5..5c01ecf42a 100644 --- a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_purple.xml @@ -8,7 +8,7 @@ android:pivotY="15%" android:toDegrees="45" > - + 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 a2d3e6ad2a..ecf4962bda 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 @@ -22,7 +22,7 @@ android:id="@+id/llMarkerContent" android:layout_width="wrap_content" android:layout_height="@dimen/dp_74" - android:background="@drawable/bg_map_marker_green_info" + android:background="@drawable/bg_map_marker_blue_info" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" > @@ -71,7 +71,7 @@ android:id="@+id/ivReverseTriangle" android:layout_width="10dp" android:layout_height="10dp" - android:src="@drawable/bg_shape_reverse_triangle_green" + android:src="@drawable/bg_shape_reverse_triangle_blue" app:layout_constraintEnd_toEndOf="@+id/llMarkerContent" app:layout_constraintStart_toStartOf="@+id/llMarkerContent" app:layout_constraintTop_toBottomOf="@+id/llMarkerContent" />