opt package dep

modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/OwnCarModelEntity.java

@@ -1,58 +0,0 @@
-package com.mogo.module.common.entity;
-
-/**
- * 自车模型实体，用于从服务端获取不同等级的自车模型信息以及将此信息传递给adas
- *
- * @author tongchenfei
- */
-public class OwnCarModelEntity {
-    /**
-     * 图片锁定 1-是 0-否
-     */
-    private int isLock;
-    private String imageUrl;
-    private String imageName;
-    private int imageLevel;
-
-    public int getIsLock() {
-        return isLock;
-    }
-
-    public void setIsLock(int isLock) {
-        this.isLock = isLock;
-    }
-
-    public String getImageUrl() {
-        return imageUrl;
-    }
-
-    public void setImageUrl(String imageUrl) {
-        this.imageUrl = imageUrl;
-    }
-
-    public String getImageName() {
-        return imageName;
-    }
-
-    public void setImageName(String imageName) {
-        this.imageName = imageName;
-    }
-
-    public int getImageLevel() {
-        return imageLevel;
-    }
-
-    public void setImageLevel(int imageLevel) {
-        this.imageLevel = imageLevel;
-    }
-
-    @Override
-    public String toString() {
-        return "OwnCarModelEntity{" +
-                "isLock=" + isLock +
-                ", imageUrl='" + imageUrl + '\'' +
-                ", imageName='" + imageName + '\'' +
-                ", imageLevel=" + imageLevel +
-                '}';
-    }
-}

modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MyLocationUtil.java

@@ -16,9 +16,11 @@ import androidx.annotation.Nullable;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
+import com.mogo.commons.context.ContextHolderUtil;
 import com.mogo.map.uicontroller.CarCursorOption;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.R;
+import com.mogo.service.datamanager.IMogoDataChangedListener;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.ViewUtils;
 import com.mogo.utils.glide.GlideApp;
@@ -34,6 +36,17 @@ public class MyLocationUtil {
     private static boolean isLoadingIcon = false;
     private static boolean needEmphasizeMyLocation = false;
 
+    static {
+        MogoApisHandler.getInstance().getApis().getDataManagerApi()
+                .registerDataListener( "ADAS", data ->{
+                    if ( data == null ) {
+                        emphasizeMyLocation();
+                    } else if( data instanceof String ){
+                        setMyLocationIconUrl( ContextHolderUtil.getContext(), ( ( String ) data ));
+                    }
+                } );
+    }
+
     public static void emphasizeMyLocation(){
         if (!isLoadingIcon) {
             MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().emphasizeMyLocation();

modules/mogo-module-common/src/main/java/com/mogo/module/common/utils/SPConst.java

@@ -1,11 +1,13 @@
 package com.mogo.module.common.utils;
 
+import com.mogo.commons.debug.DebugConfig;
+
 /**
  * 多模块之间SP状态公共类
  */
 public class SPConst {
 
-    private static String SP_GUIDE = "SP_GUIDE_2020_09_09";
+    private static String SP_GUIDE = DebugConfig.SP_GUIDE;
 
     //用于多模块之间引导状态判断
     public static String getSpGuide() {