From 4822fdb57a7f6eab2bb668cfa75066cf7ec509d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 10 Jan 2020 11:13:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dmarker=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/view_map_marker.xml | 43 +++++++++++-------- .../main/res/layout/view_map_marker_info.xml | 26 +++++------ 2 files changed, 38 insertions(+), 31 deletions(-) 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 06fe0259a4..78cc7c93b1 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 @@ -7,31 +7,46 @@ android:orientation="vertical" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" > + + - + app:layout_constraintTop_toTopOf="parent" + app:miv_failureHolder="@drawable/icon_default" + app:miv_overlayImageId="@drawable/icon_default" + app:miv_placeHolder="@drawable/icon_default" + app:miv_shape="circle" /> - - \ 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 48b96abba9..388674c7e2 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 @@ -8,10 +8,21 @@ android:orientation="horizontal" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout" > + + - \ No newline at end of file From 2c8563219b3e21f5ea3d2cc78f750b30fbf249ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 10 Jan 2020 11:49:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86Marker=E7=9A=84?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=88=87=E6=8D=A2=E6=A0=B7=E5=BC=8F=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=BF=98=E6=9C=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9=E5=BA=95=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/MarkerServiceHandler.java | 35 +++++++++++++++++-- .../main/res/layout/view_map_marker_info.xml | 10 ++++++ 2 files changed, 43 insertions(+), 2 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 e34429f83c..87bd704ff0 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 @@ -106,6 +106,8 @@ public class MarkerServiceHandler { } + private static IMogoMarker lastMarker; + /** * 地图上的Marker点击回调 */ @@ -114,6 +116,35 @@ public class MarkerServiceHandler { @Override public boolean onMarkerClicked(IMogoMarker marker) { TipToast.shortTip("点击了大而全中的Marker"); + if (lastMarker != null) { + MapMarkerView mapMarkerView = new MapMarkerView(mContext); + + MogoMarkerOptions options = new MogoMarkerOptions() + .icon(mapMarkerView) + .owner(lastMarker.getOwner()) + .latitude(lastMarker.getPosition().getLat()) + .longitude(lastMarker.getPosition().getLng()); + + IMogoMarker newMarker = getMarkerManager().addMarker(lastMarker.getOwner(), options); + newMarker.setInfoWindowAdapter(markerInfoWindowAdapter); + newMarker.setOnMarkerClickListener(mogoMarkerClickListener); + newMarker.setObject(lastMarker.getObject()); + } + + lastMarker = marker; + + MapMarkerInfoView mapMarkerInfoView = new MapMarkerInfoView(mContext); + + MogoMarkerOptions options = new MogoMarkerOptions() + .icon(mapMarkerInfoView) + .owner(marker.getOwner()) + .latitude(marker.getPosition().getLat()) + .longitude(marker.getPosition().getLng()); + + IMogoMarker newMarker = getMarkerManager().addMarker(marker.getOwner(), options); + newMarker.setInfoWindowAdapter(markerInfoWindowAdapter); + newMarker.setOnMarkerClickListener(mogoMarkerClickListener); + newMarker.setObject(marker.getObject()); return false; } @@ -176,7 +207,7 @@ public class MarkerServiceHandler { } } - getMapUIController().changeZoom(10); + getMapUIController().changeZoom(8); } /** @@ -241,6 +272,6 @@ public class MarkerServiceHandler { marker.setOnMarkerClickListener(mogoMarkerClickListener); marker.setObject("我是Marker上面绑定的数据"); - getMapUIController().changeZoom(10); + getMapUIController().changeZoom(8); } } 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 388674c7e2..2f940f1122 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 @@ -40,6 +40,16 @@ app:miv_placeHolder="@drawable/icon_default" app:miv_shape="circle" /> + + Date: Fri, 10 Jan 2020 12:05:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E7=82=B9?= =?UTF-8?q?=E5=87=BBMarker=E5=88=87=E6=8D=A2=E6=A0=B7=E5=BC=8F=E7=9A=84?= =?UTF-8?q?=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/service/MarkerServiceHandler.java | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 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 87bd704ff0..c9805ebbef 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 @@ -24,7 +24,6 @@ import com.mogo.service.connection.IMogoOnMessageListener; import com.mogo.service.connection.IMogoSocketManager; import com.mogo.service.imageloader.IMogoImageloader; import com.mogo.service.map.IMogoMapService; -import com.mogo.utils.TipToast; import com.mogo.utils.logger.Logger; import java.util.List; @@ -115,7 +114,7 @@ public class MarkerServiceHandler { @Override public boolean onMarkerClicked(IMogoMarker marker) { - TipToast.shortTip("点击了大而全中的Marker"); + Logger.e(TAG, "点击了大而全中的Marker"); if (lastMarker != null) { MapMarkerView mapMarkerView = new MapMarkerView(mContext); @@ -129,12 +128,13 @@ public class MarkerServiceHandler { newMarker.setInfoWindowAdapter(markerInfoWindowAdapter); newMarker.setOnMarkerClickListener(mogoMarkerClickListener); newMarker.setObject(lastMarker.getObject()); + + lastMarker.destroy(); } - lastMarker = marker; + // MapMarkerInfoView mapMarkerInfoView = new MapMarkerInfoView(mContext); - MogoMarkerOptions options = new MogoMarkerOptions() .icon(mapMarkerInfoView) .owner(marker.getOwner()) @@ -146,6 +146,8 @@ public class MarkerServiceHandler { newMarker.setOnMarkerClickListener(mogoMarkerClickListener); newMarker.setObject(marker.getObject()); + lastMarker = newMarker; + marker.destroy(); return false; } } @@ -222,32 +224,13 @@ public class MarkerServiceHandler { Object bindObject, MarkerLocation markerLocation) { Logger.e(TAG, "绘制Marker====markerTag：" + markerTag); - MapMarkerView mapMarkerView = new MapMarkerView(mContext); - MapMarkerInfoView mapMarkerInfoView = new MapMarkerInfoView(mContext); MogoMarkerOptions options = new MogoMarkerOptions() .owner(markerTag) .latitude(markerLocation.getLat()) .longitude(markerLocation.getLon()); - - switch (markerTag) { - case ServiceConst.CARD_TYPE_CARS_CHATTING: - options.icon(mapMarkerView); - break; - case ServiceConst.CARD_TYPE_ROAD_CODITION: - options.icon(mapMarkerView); - break; - case ServiceConst.CARD_TYPE_SHARE_MUSIC: - options.icon(mapMarkerView); - break; - case ServiceConst.CARD_TYPE_USER_DATA: - options.icon(mapMarkerInfoView); - break; - default: - options.icon(mapMarkerView); - break; - } + options.icon(mapMarkerView); IMogoMarker marker = getMarkerManager().addMarker(markerTag, options); marker.setInfoWindowAdapter(markerInfoWindowAdapter); From 90c9a837ddb68c6bfc23b608be13a831fcb9979c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Fri, 10 Jan 2020 12:06:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E7=9A=84=E6=96=B9=E6=B3=95=E5=AF=BC=E8=87=B4=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../mogo/service/impl/statusmanager/MogoStatusManager.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 8a8f75bfe2..703e5d4b89 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,7 +5,7 @@ - + diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java index 04654afc1c..450de25ac1 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java @@ -69,6 +69,11 @@ public class MogoStatusManager implements IMogoStatusManager { return get_bool_val( StatusDescriptor.USER_INTERACTED ); } + @Override + public boolean isSearchUIShow() { + return false; + } + private boolean get_bool_val( StatusDescriptor descriptor ) { Boolean val = mStatus.get( descriptor ); return val == null ? false : val;