Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev

modules/mogo-module-main/build.gradle

@@ -52,6 +52,7 @@ dependencies {
         api rootProject.ext.dependencies.moduleservice
         api rootProject.ext.dependencies.moduleapps
         api rootProject.ext.dependencies.moduleextensions
+        compileOnly rootProject.ext.dependencies.skinsupport
     } else {
         api project(":foudations:mogo-utils")
         api project(":foudations:mogo-commons")
@@ -62,6 +63,7 @@ dependencies {
         api project(':services:mogo-service')
         api project(':modules:mogo-module-apps')
         api project(':modules:mogo-module-extensions')
+        compileOnly project(':skin:mogo-skin-support')
     }
 }
 

modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java

@@ -73,6 +73,23 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         return R.layout.module_main_activity_main;
     }
 
+    @Override
+    protected void beforeSetContentView( Bundle savedInstanceState ) {
+        init();
+        installSkinManager( savedInstanceState );
+    }
+
+    /**
+     * 安装皮肤支持
+     *
+     * @param savedInstanceState
+     */
+    private void installSkinManager( Bundle savedInstanceState ) {
+        mServiceApis.getMapServiceApi().getMapViewInstanceHandler().createMapViewInstance( this );
+        mServiceApis.getSkinSupportInstallerApi().install( getApplication() );
+        mServiceApis.getSkinSupportInstallerApi().onCompensateActivityCreated( this, savedInstanceState );
+    }
+
     @Override
     protected void initViews() {
 
@@ -113,7 +130,6 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
     @Override
     protected void onCreate( @Nullable Bundle savedInstanceState ) {
         super.onCreate( savedInstanceState );
-        init();
         mPresenter.postLoadModuleMsg();
     }
 
@@ -326,6 +342,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
         mMogoMapService = null;
         mMogoMapUIController = null;
         mMogoFragmentManager = null;
+        mServiceApis.getMapServiceApi().getMapViewInstanceHandler().destroy();
         AdasConfigApiController.getInstance().release();
         mServiceApis.getAdasControllerApi().release();
         Logger.d( TAG, "destroy." );