From 6de06491283ffa50f450207f3946804341cf5e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Sun, 26 Apr 2020 18:25:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0V2X=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/gradle.properties b/gradle.properties index a8b21254ac..6040930198 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT # 在线车辆F MOGO_MODULE_ONLINECAR_VERSION=1.0.3.1 # v2x -MOGO_MODULE_V2X_VERSION=1.0.5-SNAPSHOT +MOGO_MODULE_V2X_VERSION=1.0.6-SNAPSHOT # 媒体卡片 MOGO_MODULE_MEDIA_VERSION=1.0.4.3 # 推送 From d8216dc43b148aefadcfadbe642cb1cb06c7fcb4 Mon Sep 17 00:00:00 2001 From: ihoudf <188816190@qq.com> Date: Sun, 26 Apr 2020 18:42:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?onlinecar=20smooth=20=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=B0=94=E6=B3=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/marker/MapMarkerBaseView.java | 1 + .../java/com/mogo/module/service/marker/MapMarkerManager.java | 1 + .../java/com/mogo/module/service/marker/MapMarkerView.java | 3 ++- .../src/main/res/layout/view_map_marker.xml | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) 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 c790f05e65..e46baeee29 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 @@ -41,6 +41,7 @@ public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerV protected MogoImageView ivUserHead; protected ImageView ivIcon; protected ImageView ivCar; + protected ConstraintLayout clMarkerTopView; protected IMogoMarker mMarker; public MapMarkerBaseView(Context context) { 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 c097830931..cfa96369d9 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 @@ -444,6 +444,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, } IMogoMarker iMogoMarker = drawMapMarker(markerShowEntity); +// iMogoMarker.setInfoWindowAdapter(this); startSmooth(iMogoMarker, markerOnlineCar, markerLocation); // 计算在线车辆距离当前车辆的距离，每次都与最后一次距离最近的进行比较，保留距离最近的车辆，进行卡片展示 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 8ea5d8c389..7679c23839 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 @@ -55,6 +55,7 @@ public class MapMarkerView extends MapMarkerBaseView { ivIcon = findViewById(R.id.ivIcon); ivCar = findViewById(R.id.ivCar); ivBg = findViewById(R.id.ivBg); + clMarkerTopView = findViewById(R.id.clMarkerTopView); } public void updateView(MarkerShowEntity markerShowEntity) { @@ -69,7 +70,7 @@ public class MapMarkerView extends MapMarkerBaseView { ivCar.setImageResource(R.drawable.icon_map_marker_car_gray); ivCar.setRotation((float) markerShowEntity.getMarkerLocation().getAngle()); // ivCar.setRotation(new Random().nextInt(360)); - + clMarkerTopView.setVisibility(View.GONE); if (bindObj instanceof MarkerOnlineCar) { if (((MarkerOnlineCar) bindObj).getUserInfo().getGenderValue() == 0) { ivBg.setImageResource(R.drawable.bg_map_marker_blue); 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 b37be6dc5d..689fcee3f6 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 @@ -12,7 +12,8 @@ + android:layout_height="wrap_content" + android:id="@+id/clMarkerTopView">