From f7a7994eeb209343284f8be3357cfc605b376f9a Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Mon, 2 Nov 2020 16:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/mogo/map/impl/automap/navi/AutoNaviClient.java | 2 +-
 .../src/main/java/com/mogo/module/apps/AppFilterImpl.java   | 4 ++--
 .../com/mogo/module/service/marker/MapMarkerBaseView.java   | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java
index 9a8e553254..39bd15bb19 100644
--- a/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java
+++ b/libraries/map-autonavi/src/main/java/com/mogo/map/impl/automap/navi/AutoNaviClient.java
@@ -56,7 +56,7 @@ public class AutoNaviClient implements IMogoNavi {
     private final Context mContext;
 
     private AutoNaviClient( Context context ) {
-        mContext = context;
+        mContext = context.getApplicationContext();
     }
 
     public static AutoNaviClient getInstance( Context context ) {
diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java
index 424749795d..7029ae106b 100644
--- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java
+++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppFilterImpl.java
@@ -5,7 +5,7 @@ import android.content.pm.PackageInfo;
 import android.text.TextUtils;
 
 import com.mogo.commons.AbsMogoApplication;
-import com.mogo.module.common.utils.CarSeries;
+import com.mogo.commons.debug.DebugConfig;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -29,7 +29,7 @@ public class AppFilterImpl {
     private static List< String > sExternalConfigPackages = new ArrayList<>();
 
     static {
-        if ( CarSeries.getSeries() != CarSeries.CAR_SERIES_F80X ) {
+        if ( !DebugConfig.getProductFlavor().startsWith( "f8" ) ) {
             final String[] values = AbsMogoApplication.getApp().getResources().getStringArray( R.array.module_apps_array_filter_packages );
             if ( values != null ) {
                 mFilterPackages = new ArrayList( Arrays.asList( values ) );
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 4ffecc4c40..0e51579ecc 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
@@ -93,6 +93,7 @@ public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerV
     }
 
     private void loadPoiTypeIconInUiThread(String url,int res) {
+        ivIcon.setImageResource(res);
         if (!url.isEmpty()) {
             ivIcon.setPlaceHolder(res);
             ivIcon.setFailureHolder(res);
@@ -118,11 +119,6 @@ public abstract class MapMarkerBaseView extends LinearLayout implements IMarkerV
                             Logger.e(TAG, "loadImageWithMarker onFailure.");
                         }
                     });
-        }else{
-            ivIcon.setImageResource(res);
-        }
-        if (mMarker != null) {
-            mMarker.setIcon(fromView(MapMarkerBaseView.this));
         }
     }