Merge branch 'feature/v1.0.5' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into feature/v1.0.5

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

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) {

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);
 
             // 计算在线车辆距离当前车辆的距离，每次都与最后一次距离最近的进行比较，保留距离最近的车辆，进行卡片展示

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);

modules/mogo-module-service/src/main/res/layout/view_map_marker.xml

@@ -12,7 +12,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content"
+        android:id="@+id/clMarkerTopView">
 
         <ImageView
             android:id="@+id/ivBg"