From 7524c3b42d585f30a09c312f62eeeb52fd55e2ef Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Sat, 14 Mar 2020 13:30:48 +0800
Subject: [PATCH] opt

---
 app/build.gradle                                   | 14 +++++++++++---
 .../java/com/mogo/map/impl/amap/hook/BnHooker.java |  4 ++++
 .../module/service/marker/MapMarkerManager.java    |  5 ++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ad5fcc5f39..94aa2c83dd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,13 +39,11 @@ android {
         debug {
             signingConfig signingConfigs.release
             debuggable = true
-            buildConfigField 'int', 'NET_ENV', '2'
         }
         release {
             minifyEnabled false
             signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            buildConfigField 'int', 'NET_ENV', '2'
         }
     }
     compileOptions {
@@ -53,11 +51,12 @@ android {
         targetCompatibility 1.8
     }
 
-    flavorDimensions "default"
+    flavorDimensions "product", "env"
 
     productFlavors {
         //诺威达
         nwd {
+            dimension "product"
             sourceSets {
                 main {
                     manifest.srcFile 'src/nwd/AndroidManifest.xml'
@@ -65,12 +64,21 @@ android {
             }
         }
         zhidao {
+            dimension "product"
             sourceSets {
                 main {
                     manifest.srcFile 'src/main/AndroidManifest.xml'
                 }
             }
         }
+        qa {
+            dimension "env"
+            buildConfigField 'int', 'NET_ENV', '2'
+        }
+        online {
+            dimension "env"
+            buildConfigField 'int', 'NET_ENV', '3'
+        }
     }
 }
 
diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/hook/BnHooker.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/hook/BnHooker.java
index ffb6c4c7ed..420548776c 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/hook/BnHooker.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/hook/BnHooker.java
@@ -3,6 +3,7 @@ package com.mogo.map.impl.amap.hook;
 import com.amap.api.maps.AMap;
 import com.autonavi.base.amap.api.mapcore.IAMapDelegate;
 import com.autonavi.base.amap.mapcore.interfaces.IAMapListener;
+import com.mogo.utils.logger.Logger;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationHandler;
@@ -43,6 +44,9 @@ public class BnHooker implements InvocationHandler {
         if ( method.getName().equals( "setRenderFps" ) ) {
             return method.invoke( host, 10 );
         }
+        if ( method.getName().equals( "drawFrame" ) ) {
+            Logger.d(TAG, "drawFrame");
+        }
         return method.invoke( host, args );
     }
 }
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 a97c161bc3..d93f347338 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
@@ -782,7 +782,10 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
             List< IMogoMarker > markers = markerManager.getMarkers( biz );
             if ( markers != null ) {
                 for ( IMogoMarker marker : markers ) {
-                    if ( marker.getObject() == data ) {
+                    if ( !( marker.getObject() instanceof MarkerShowEntity ) ) {
+                        continue;
+                    }
+                    if ( ( ( MarkerShowEntity ) marker.getObject() ).getBindObj() == data ) {
                         onMarkerClicked( marker );
                         break;
                     }