From 4b7a9e9b147561558541729a2155b7606f0acc22 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 6 Jan 2021 20:38:03 +0800
Subject: [PATCH] opt

---
 .../com/mogo/module/share/TanluServiceManager.java   |  3 ++-
 .../service/impl/singleton/SingletonsHolder.java     |  6 +++---
 .../java/skin/support/app/SkinCompatDelegate.java    | 12 ++++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluServiceManager.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluServiceManager.java
index b726823121..de27299bef 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluServiceManager.java
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/TanluServiceManager.java
@@ -7,6 +7,7 @@ import com.mogo.map.location.IMogoLocationClient;
 import com.mogo.map.navi.IMogoAimless;
 import com.mogo.map.search.poisearch.IMogoPoiSearch;
 import com.mogo.map.search.poisearch.query.MogoPoiSearchQuery;
+import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.analytics.IMogoAnalytics;
@@ -35,7 +36,7 @@ public class TanluServiceManager {
     private static IMogoAimless mIMogoAimless;
 
     public static void init(Context context) {
-        mServiceApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(context);
+        mServiceApis = MogoApisHandler.getInstance().getApis();
         mMapService = mServiceApis.getMapServiceApi();
         mIMogoStatusManager = mServiceApis.getStatusManagerApi();
         mAnalytics = mServiceApis.getAnalyticsApi();
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java b/services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java
index c96f8820a0..ecf642840e 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/singleton/SingletonsHolder.java
@@ -12,6 +12,7 @@ import com.mogo.service.map.IMogoMapService;
 import com.mogo.service.network.IMogoNetwork;
 import com.mogo.service.statusmanager.IMogoMsgCenter;
 import com.mogo.service.statusmanager.IMogoStatusManager;
+import com.mogo.service.strategy.IMogoRefreshStrategyController;
 import com.mogo.service.windowview.IMogoTopViewManager;
 import com.mogo.service.windowview.IMogoWindowManager;
 
@@ -36,11 +37,10 @@ public class SingletonsHolder {
         sSingletons.put( IMogoNetwork.class, new MogoNetWorkService() );
         sSingletons.put( IMogoMsgCenter.class, new MogoMsgCenter() );
         sSingletons.put( IMogoStatusManager.class, new MogoStatusManager() );
-        sSingletons.put( IMogoTopViewManager.class, ARouter.getInstance().navigation( IMogoTopViewManager.class ) );
-        sSingletons.put( IMogoWindowManager.class, ARouter.getInstance().navigation( IMogoWindowManager.class ) );
+        sSingletons.put( IMogoRefreshStrategyController.class, ARouter.getInstance().navigation( IMogoRefreshStrategyController.class ) );
     }
 
-    public static < T > T get( Class<T> clazz ) {
+    public static < T > T get( Class< T > clazz ) {
         return ( T ) sSingletons.get( clazz );
     }
 
diff --git a/skin/skin-support/src/main/java/skin/support/app/SkinCompatDelegate.java b/skin/skin-support/src/main/java/skin/support/app/SkinCompatDelegate.java
index 814105646e..33097b29d8 100755
--- a/skin/skin-support/src/main/java/skin/support/app/SkinCompatDelegate.java
+++ b/skin/skin-support/src/main/java/skin/support/app/SkinCompatDelegate.java
@@ -70,12 +70,16 @@ public class SkinCompatDelegate implements LayoutInflater.Factory2 {
         }
 
         List<SkinWrapper> wrapperList = SkinCompatManager.getInstance().getWrappers();
-        for (SkinWrapper wrapper : wrapperList) {
-            Context wrappedContext = wrapper.wrapContext(mContext, parent, attrs);
-            if (wrappedContext != null) {
-                context = wrappedContext;
+
+        if ( wrapperList != null ) {
+            for (SkinWrapper wrapper : wrapperList) {
+                Context wrappedContext = wrapper.wrapContext(mContext, parent, attrs);
+                if (wrappedContext != null) {
+                    context = wrappedContext;
+                }
             }
         }
+
         return mSkinCompatViewInflater.createView(parent, name, context, attrs);
     }