wait

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/routeoverlay/RouteOverlayDrawer.java

@@ -12,7 +12,7 @@ import com.mogo.map.MogoOverlayManager;
 import com.mogo.map.overlay.IMogoOverlayManager;
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
-import com.mogo.module.common.utils.DrivingDirectionUtils;
+import com.mogo.commons.utils.DrivingDirectionUtils;
 import java.util.LinkedList;
 import java.util.List;
 import mogo.telematics.pad.MessagePad;

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapCameraInfoView.java

@@ -9,8 +9,8 @@ import android.widget.ImageView;
 import androidx.annotation.Nullable;
 
 import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
+import com.mogo.eagle.core.function.map.R;
 import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.module.common.R;
 
 /**
  * author : 李小鹏

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerAdapter.java

@@ -1,12 +1,13 @@
 package com.mogo.eagle.core.function.impl.marker;
 
+import static com.mogo.commons.module.ServiceConst.CARD_TYPE_USER_DATA;
+
 import android.content.Context;
 import android.text.TextUtils;
 
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
 import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.module.common.ModuleNames;
 
 /**
  * author : donghongyu
@@ -26,7 +27,7 @@ public class MapMarkerAdapter {
      */
     public static IMarkerView getMarkerView(Context context, MarkerShowEntity markerShowEntity, MogoMarkerOptions options) {
 
-        if (TextUtils.equals(markerShowEntity.getMarkerType(), ModuleNames.CARD_TYPE_USER_DATA)) {
+        if (TextUtils.equals(markerShowEntity.getMarkerType(), CARD_TYPE_USER_DATA)) {
             return OnlineCarMarkerView.getInstance();
         } else {
             if (MogoStatusManager.getInstance().isVrMode()) {

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/impl/marker/MapMarkerView.java

@@ -1,5 +1,7 @@
 package com.mogo.eagle.core.function.impl.marker;
 
+import static com.mogo.commons.module.ServiceConst.CARD_TYPE_ROAD_CONDITION;
+
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -14,7 +16,6 @@ import com.mogo.eagle.core.data.map.entity.MarkerShowEntity;
 import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.module.common.ModuleNames;
 import com.mogo.eagle.core.data.config.CloudPoiManager;
 
 /**
@@ -69,7 +70,7 @@ public class MapMarkerView extends MapMarkerBaseView {
     public void updateView( MarkerShowEntity markerShowEntity ) {
         Object bindObj = markerShowEntity.getBindObj();
         switch ( markerShowEntity.getMarkerType() ) {
-            case ModuleNames.CARD_TYPE_ROAD_CONDITION:
+            case CARD_TYPE_ROAD_CONDITION:
                 if ( mMarkerShowEntity != null && mMarkerShowEntity.isChecked() ) {
                     clMarkerTopView.setBackgroundResource( R.drawable.module_services_marker_vr_bkg_checked );
                 }

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java

@@ -1,7 +1,5 @@
 package com.mogo.eagle.core.function.smp;
 
-import static com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.BIZ_SLW;
-import static com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.V2I;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_MAP;
 
 import android.content.Context;
@@ -9,7 +7,6 @@ import android.graphics.Color;
 import android.location.Location;
 import android.os.Bundle;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -35,28 +32,20 @@ import com.amap.api.maps.model.PolylineOptions;
 import com.mogo.cloud.commons.utils.CoordinateUtils;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.api.map.listener.IMoGoMapLocationListener;
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerMapLocationListenerManager;
-import com.mogo.eagle.core.function.call.v2x.CallLimitingVelocityListenerManager;
 import com.mogo.eagle.core.function.map.R;
 import com.mogo.eagle.core.function.smp.view.ISmallMapDirectionView;
 import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.eagle.core.widget.RoundLayout;
-import com.mogo.map.MogoMapUIController;
-import com.mogo.module.common.utils.DrivingDirectionUtils;
-import com.zhjt.service_biz.BizConfig;
+import com.mogo.commons.utils.DrivingDirectionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import mogo.telematics.pad.MessagePad;
-
 /**
  * 小地图的方向View
  *

core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_camera_layout_info.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="1px"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <ImageView
+        android:id="@+id/iv_camera_traffic"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/module_camera_real_time_traffic" />
+
+</LinearLayout>

core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_layout.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="1px"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <FrameLayout
+        android:id="@+id/clMarkerTopView"
+        android:layout_width="@dimen/dp_120"
+        android:background="@drawable/module_services_marker_bkg"
+        android:layout_height="@dimen/dp_130">
+
+        <com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView
+            android:id="@+id/ivIcon"
+            android:layout_width="@dimen/dp_60"
+            android:layout_height="@dimen/dp_60"
+            android:layout_gravity="center"
+            android:layout_marginBottom="@dimen/module_service_marker_bubble_icon_marginBottom"
+            tools:src="@drawable/icon_map_marker_road_block_up2" />
+
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/ivCar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_4"
+        android:src="@drawable/icon_map_marker_location_yellow" />
+</LinearLayout>

core/function-impl/mogo-core-function-map/src/main/res/layout/modudle_services_marker_vr_layout.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="1px"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+
+    <FrameLayout
+        android:id="@+id/clMarkerTopView"
+        android:layout_width="@dimen/dp_55"
+        android:background="@drawable/module_services_marker_vr_bkg"
+        android:layout_height="@dimen/dp_69">
+
+        <com.mogo.eagle.core.utilcode.mogo.imageloader.MogoImageView
+            android:id="@+id/ivIcon"
+            android:layout_width="@dimen/module_service_marker_bubble_icon_vr_width"
+            android:layout_height="@dimen/module_service_marker_bubble_icon_vr_height"
+            android:layout_gravity="center"
+            android:layout_marginBottom="@dimen/module_service_marker_bubble_icon_marginBottom"
+            tools:src="@drawable/icon_map_marker_road_block_up2" />
+
+    </FrameLayout>
+
+    <ImageView
+        android:id="@+id/ivCar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_4"
+        android:src="@drawable/icon_map_marker_location_yellow_vr" />
+</LinearLayout>