From 7ad289054f1ad327805a899cbaae1ceea00ae2ac Mon Sep 17 00:00:00 2001
From: unknown <zhongchao@zdauto.com>
Date: Wed, 10 Jun 2020 10:12:50 +0800
Subject: [PATCH] fix bug of roadsearch listener

---
 app/build.gradle                                         | 2 +-
 app/src/launcher/AndroidManifest.xml                     | 2 +-
 .../com/mogo/map/impl/amap/search/RoadSearchClient.java  | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8d6d760db9..3bbdc8e59a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,7 +88,7 @@ android {
             // 是否使用自定义导航
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
             // 是否作为 launcher 运行
-            buildConfigField 'boolean', 'IS_LAUNCHER', 'true'
+            buildConfigField 'boolean', 'IS_LAUNCHER', 'false'
         }
         // f系列-分体机全系列，未细分
         f8xx{
diff --git a/app/src/launcher/AndroidManifest.xml b/app/src/launcher/AndroidManifest.xml
index 759d90f0e5..d8fcc242a2 100644
--- a/app/src/launcher/AndroidManifest.xml
+++ b/app/src/launcher/AndroidManifest.xml
@@ -21,7 +21,7 @@
 <!--            android:exported="true" />-->
         <meta-data
             android:name="com.amap.api.v2.apikey"
-            android:value="40e2e7e773c7562b1f2b13699a93992c"
+            android:value="a36b9f7b086fa3951bb35338a5a06dd3"
             tools:replace="android:value" />
         <!-- 高德地图 -->
     </application>
diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java
index 71ff552352..55dc81ad65 100644
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/RoadSearchClient.java
@@ -59,9 +59,10 @@ public class RoadSearchClient implements IMogoRoadSearch, RouteSearch.OnRouteSea
             }
         }
 
-        RouteSearch.DriveRouteQuery searchQuery = new RouteSearch.DriveRouteQuery( fromAndTo, RouteSearch.DRIVING_SINGLE_SHORTEST, latLonPointWays, null, "" );
+        RouteSearch.DriveRouteQuery searchQuery = new RouteSearch.DriveRouteQuery( fromAndTo, RouteSearch.DRIVING_MULTI_CHOICE_AVOID_CONGESTION, latLonPointWays, null, "" );
         if ( mRouteSearch == null ) {
             mRouteSearch = new RouteSearch( context );
+            mRouteSearch.setRouteSearchListener(this);
         }
         mRouteSearch.calculateDriveRouteAsyn( searchQuery );
     }
@@ -94,14 +95,18 @@ public class RoadSearchClient implements IMogoRoadSearch, RouteSearch.OnRouteSea
             return;
         }
         List< MogoLatLng > points = new ArrayList<>();
-
+        Logger.d(TAG,"onDriveRouteSearched i : " + i);
         if ( driveRouteResult == null
                 || driveRouteResult.getPaths() == null
                 || driveRouteResult.getPaths().isEmpty() ) {
+            Logger.d(TAG,"onDriveRouteSearched result is null");
             mListener.onDrivePathSearched( null );
             return;
         }
         DrivePath drivePath = driveRouteResult.getPaths().get( 0 );
+        int size = driveRouteResult.getPaths().size();
+        Logger.d(TAG,"onDriveRouteSearched driveRouteResult size : " + size);
+
         List< DriveStep > steps = drivePath.getSteps();
         if ( steps == null || steps.isEmpty() ) {
             mListener.onDrivePathSearched( null );