From 33266019f7f9f0edc809dc5fa551de191d9887e9 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 29 May 2020 11:19:57 +0800
Subject: [PATCH] bugfix

---
 .../com/mogo/map/impl/amap/BuildConfig.java   | 18 ++++++
 .../navi/constants/SearchApisHolder.java      | 57 +++++++------------
 2 files changed, 39 insertions(+), 36 deletions(-)
 create mode 100644 libraries/map-custom/build/generated/source/buildConfig/debug/com/mogo/map/impl/amap/BuildConfig.java

diff --git a/libraries/map-custom/build/generated/source/buildConfig/debug/com/mogo/map/impl/amap/BuildConfig.java b/libraries/map-custom/build/generated/source/buildConfig/debug/com/mogo/map/impl/amap/BuildConfig.java
new file mode 100644
index 0000000000..e5130dee9f
--- /dev/null
+++ b/libraries/map-custom/build/generated/source/buildConfig/debug/com/mogo/map/impl/amap/BuildConfig.java
@@ -0,0 +1,18 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.mogo.map.impl.amap;
+
+public final class BuildConfig {
+  public static final boolean DEBUG = Boolean.parseBoolean("true");
+  public static final String LIBRARY_PACKAGE_NAME = "com.mogo.map.impl.amap";
+  /**
+   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
+   */
+  @Deprecated
+  public static final String APPLICATION_ID = "com.mogo.map.impl.amap";
+  public static final String BUILD_TYPE = "debug";
+  public static final String FLAVOR = "";
+  public static final int VERSION_CODE = 1;
+  public static final String VERSION_NAME = "";
+}
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
index 26fabf1bac..378ecf5802 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
+++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/constants/SearchApisHolder.java
@@ -31,100 +31,85 @@ public class SearchApisHolder {
     private static final String TAG = "SearchApisHolder";
 
     private static IMogoServiceApis sApis;
-    private static IMogoMapService sMapServiceApis;
-    private static IMogoMapUIController sUiControllerApis;
-    private static IMogoNavi sNaviApis;
-    private static IMogoMarkerManager sMarkerManagerApis;
-    private static IMogoFragmentManager sFragmentManagerApis;
-    private static IMogoAnalytics sAnalyticsApis;
-    private static IMogoLocationClient sLocationClientApis;
-    private static IMogoStatusManager sStatusManager;
-    private static IMogoRegisterCenter sRegisterCenterApis;
-    private static IMogoIntentManager sIntentManager;
     private static IGuideShowProvider sGuideShowApis;
-    private static IMogoSettingManager sSettingManager;
     private static IMogoGpsSimulatorManager sGpsSimulatorManager;
-    private static IMogoSearchManager sSearchManager;
 
     private static PersonalInfoManagerImpl mPersonalInfoManager;
 
     static {
         Logger.d( TAG, "static block init." );
         sApis = ARouter.getInstance().navigation( IMogoServiceApis.class );
-        sMapServiceApis = sApis.getMapServiceApi();
-        sUiControllerApis = sMapServiceApis.getMapUIController();
-        sNaviApis = sMapServiceApis.getNavi( AbsMogoApplication.getApp() );
-        sMarkerManagerApis = sMapServiceApis.getMarkerManager( AbsMogoApplication.getApp() );
-        sFragmentManagerApis = sApis.getFragmentManagerApi();
-        sAnalyticsApis = sApis.getAnalyticsApi();
-        sLocationClientApis = sMapServiceApis.getSingletonLocationClient( AbsMogoApplication.getApp() );
-        sStatusManager = sApis.getStatusManagerApi();
-        sRegisterCenterApis = sApis.getRegisterCenterApi();
-        sIntentManager = sApis.getIntentManagerApi();
-        sSettingManager = sApis.getSettingManagerApi();
-        sSearchManager = sApis.getSearchManagerApi();
         sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
         sGuideShowApis = ARouter.getInstance().navigation( IGuideShowProvider.class );
     }
 
     public static IMogoServiceApis getApis() {
+        if ( sApis == null ) {
+            sApis = ARouter.getInstance().navigation( IMogoServiceApis.class );
+        }
         return sApis;
     }
 
     public static IMogoMapService getMapServiceApis() {
-        return sMapServiceApis;
+        return getApis().getMapServiceApi();
     }
 
     public static IMogoMapUIController getUiControllerApis() {
-        return sUiControllerApis;
+        return getMapServiceApis().getMapUIController();
     }
 
     public static IMogoNavi getNaviApis() {
-        return sNaviApis;
+        return getMapServiceApis().getNavi( AbsMogoApplication.getApp() );
     }
 
     public static IMogoMarkerManager getMarkerManager() {
-        return sMarkerManagerApis;
+        return getMapServiceApis().getMarkerManager( AbsMogoApplication.getApp() );
     }
 
     public static IMogoFragmentManager getFragmentManager() {
-        return sFragmentManagerApis;
+        return getApis().getFragmentManagerApi();
     }
 
     public static IMogoAnalytics getAnalyticsApis() {
-        return sAnalyticsApis;
+        return getApis().getAnalyticsApi();
     }
 
     public static IMogoLocationClient getLocationClientApis() {
-        return sLocationClientApis;
+        return getMapServiceApis().getSingletonLocationClient( AbsMogoApplication.getApp() );
     }
 
     public static IMogoStatusManager getStatusManager() {
-        return sStatusManager;
+        return getApis().getStatusManagerApi();
     }
 
     public static IMogoRegisterCenter getRegisterCenterApis() {
-        return sRegisterCenterApis;
+        return getApis().getRegisterCenterApi();
     }
 
     public static IMogoIntentManager getIntentManager() {
-        return sIntentManager;
+        return getApis().getIntentManagerApi();
     }
 
     public static IGuideShowProvider getGuideShowApis() {
+        if ( sGuideShowApis == null ) {
+            sGuideShowApis = ARouter.getInstance().navigation( IGuideShowProvider.class );
+        }
         return sGuideShowApis;
     }
 
     public static IMogoSettingManager getSettingManager() {
-        return sSettingManager;
+        return getApis().getSettingManagerApi();
     }
 
     public static IMogoGpsSimulatorManager getGpsSimulatorManager() {
+        if ( sGpsSimulatorManager == null ) {
+            sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
+        }
         return sGpsSimulatorManager;
     }
 
     public static IMogoSearchManager getSearchManager() {
-        return sSearchManager;
+        return getApis().getSearchManagerApi();
     }
 
     public static PersonalInfoManagerImpl getPersonalInfoManager() {