From 82852618e8bf33e9a50cee2e253cbb9ced0b7fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 31 Aug 2021 18:44:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97=20:modules:mogo-module-spl?=
 =?UTF-8?q?ash-noop=20:modules:mogo-module-splash=20:modules:mogo-module-m?=
 =?UTF-8?q?edia=20:modules:mogo-module-guide?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                       |  4 ----
 app/build.gradle                                       |  4 ----
 .../main/java/com/mogo/launcher/MogoApplication.java   |  4 ----
 .../main/java/com/mogo/module/main/MainActivity.java   |  7 -------
 .../src/main/java/com/mogo/module/main/MainView.java   |  4 ----
 .../com/mogo/module/main/cards/MogoModulesHandler.java |  7 -------
 .../com/mogo/module/main/cards/MogoModulesManager.java | 10 ----------
 .../main/java/com/mogo/service/IMogoServiceApis.java   |  9 +--------
 .../java/com/mogo/service/impl/MogoServiceApis.java    |  5 -----
 settings.gradle                                        |  4 ----
 10 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 118c2006ee..5ab50e02d6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -42,13 +42,11 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-back" />
             <option value="$PROJECT_DIR$/modules/mogo-module-common" />
             <option value="$PROJECT_DIR$/modules/mogo-module-extensions" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-guide" />
             <option value="$PROJECT_DIR$/modules/mogo-module-hmi" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel" />
             <option value="$PROJECT_DIR$/modules/mogo-module-left-panel-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-main" />
             <option value="$PROJECT_DIR$/modules/mogo-module-map" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-media" />
             <option value="$PROJECT_DIR$/modules/mogo-module-monitor" />
             <option value="$PROJECT_DIR$/modules/mogo-module-obu" />
             <option value="$PROJECT_DIR$/modules/mogo-module-obu-mogo" />
@@ -59,8 +57,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-service" />
             <option value="$PROJECT_DIR$/modules/mogo-module-share" />
             <option value="$PROJECT_DIR$/modules/mogo-module-smp" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-splash" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-splash-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-v2x" />
             <option value="$PROJECT_DIR$/modules/mogo-module-widgets" />
             <option value="$PROJECT_DIR$/services" />
diff --git a/app/build.gradle b/app/build.gradle
index b18fbfa1ab..b8b1c2491a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -183,7 +183,6 @@ dependencies {
         implementation rootProject.ext.dependencies.modulecommon
         implementation rootProject.ext.dependencies.modulesearch
         implementation rootProject.ext.dependencies.mogomoduleauth
-        implementation rootProject.ext.dependencies.modulesplash
         implementation rootProject.ext.dependencies.mogoservice
         implementation rootProject.ext.dependencies.moduleV2x
         implementation rootProject.ext.dependencies.moduleshare
@@ -200,7 +199,6 @@ dependencies {
         implementation project(':modules:mogo-module-search')
         implementation project(':modules:mogo-module-authorize')
         implementation project(':modules:mogo-module-service')
-        implementation project(':modules:mogo-module-splash')
         implementation project(':modules:mogo-module-service')
         implementation project(':modules:mogo-module-v2x')
         implementation project(':modules:mogo-module-share')
@@ -225,8 +223,6 @@ dependencies {
     apply from: "./functions/widgets.gradle"
     apply from: "./functions/tts.gradle"
     apply from: "./functions/backwidget.gradle"
-    apply from: "./functions/mediaui.gradle"
-    apply from: "./functions/bizguide.gradle"
     apply from: "./functions/och.gradle"
 
 //    implementation group: "com.tencent.matrix", name: "matrix-android-lib", version: '0.6.6', changing: true
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 48ebf35527..15155bc64d 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -271,14 +271,10 @@ public class MogoApplication extends AbsMogoApplication {
 
     private void initModules() {
         Logger.d(TAG, "initModules");
-        if (DebugConfig.isNeedLoadGuideModule()) {
-            MogoModulePaths.addModule(new MogoModule(MogoModulePaths.PATH_GUIDE, MogoModulePaths.PATH_GUIDE));
-        }
         MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME));
 
         if (DebugConfig.isLauncher()) {
             MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_BACK, MogoServicePaths.PATH_BACK));
-            MogoModulePaths.addModule(new MogoModule(MogoModulePaths.PATH_MEDIA, MogoModulePaths.PATH_MEDIA));
         }
         MogoModulePaths.addModule(new MogoModule(ServiceConst.PATH_TTS_CONFIG, ServiceConst.PATH_TTS_CONFIG));
 
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 9ff1c6930f..e90b60309d 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -192,8 +192,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         final long start = System.currentTimeMillis();
 
         MogoModulesManager.getInstance().init(this);
-        loadSplash();
-
 
         if (DebugConfig.isMapBased()) {
             if (mServiceApis.getMapServiceApi() != null) {
@@ -293,11 +291,6 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
         List<IMogoModuleProvider> providers = MogoModulesManager.getInstance().loadCardsModule();
     }
 
-    @Override
-    public void loadSplash() {
-        MogoModulesManager.getInstance().loadSplashModule(R.id.module_main_id_splash_container);
-    }
-
     @NonNull
     @Override
     protected MainPresenter createPresenter() {
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java
index bdbacc1766..054812e994 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainView.java
@@ -33,8 +33,4 @@ public interface MainView extends IView {
      */
     IMogoServiceApis getApis();
 
-    /**
-     * 加载闪屏页
-     */
-    void loadSplash();
 }
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
index 83183f53f0..f7fb6a295c 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java
@@ -74,13 +74,6 @@ public interface MogoModulesHandler {
      */
     void loadLeftPanelModule(int containerId);
 
-    /**
-     * 加载比亚迪模块
-     *
-     * @param containerId
-     */
-    void loadSplashModule(int containerId);
-
     /**
      * 释放各个模块资源
      */
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
index 96a3cd4d6b..2fee19e6a2 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java
@@ -12,8 +12,6 @@ import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.main.MainActivity;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.module.IMogoModuleProvider;
-import com.mogo.service.obu.IMoGoObuProvider;
-import com.mogo.service.warning.IMoGoWaringProvider;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.logger.Logger;
 
@@ -142,14 +140,6 @@ public class MogoModulesManager implements MogoModulesHandler {
         addFragment( provider, containerId );
     }
 
-    @Override
-    public void loadSplashModule( int containerId ) {
-        IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
-                .build( MogoServicePaths.PATH_SPLASH )
-                .navigation( getContext() );
-        addFragment( provider, containerId );
-    }
-
     @Override
     public void loadBaseModule() {
         List< MogoModule > baseModules = MogoModulePaths.getBaseModules();
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
index fab4972cf9..4352ef9149 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
@@ -185,14 +185,7 @@ public interface IMogoServiceApis extends IProvider {
      */
     IMogoRefreshStrategyController getRefreshStrategyControllerApi();
 
-    /**
-     * 地址操作
-     * Deprecated, use {@link IMogoSearchManager} instead.
-     *
-     * @return
-     */
-    @Deprecated
-    IMogoAddressManager getAddressManagerApi();
+
 
     /**
      * 桌面控制接口
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
index c86ee37f62..1f50864dba 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
@@ -171,11 +171,6 @@ public class MogoServiceApis implements IMogoServiceApis {
         return getApiInstance(IMogoRefreshStrategyController.class, MogoServicePaths.PATH_REFRESH_STRATEGY_API);
     }
 
-    @Override
-    public IMogoAddressManager getAddressManagerApi() {
-        return getApiInstance(IMogoAddressManager.class, MogoServicePaths.PATH_ADDRESS_MANAGER);
-    }
-
     @Override
     public IMogoLauncher getLauncherApi() {
         return getApiInstance(IMogoLauncher.class, MogoServicePaths.PATH_LAUNCHER_API);
diff --git a/settings.gradle b/settings.gradle
index bfd518c330..7965680275 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,8 +25,6 @@ include ':skin:mogo-skin-support-noop'
 include ':skin:mogo-skin-support'
 include ':modules:mogo-module-widgets'
 include ':modules:mogo-module-monitor'
-include ':modules:mogo-module-splash-noop'
-include ':modules:mogo-module-splash'
 include ':modules:mogo-module-left-panel-noop'
 include ':modules:mogo-module-left-panel'
 include ':modules:mogo-module-obu'
@@ -51,7 +49,6 @@ include ':libraries:mogo-map-api'
 include ':modules:mogo-module-apps'
 include ':modules:mogo-module-extensions'
 include ':libraries:map-autonavi'
-include ':modules:mogo-module-media'
 include ':modules:mogo-module-v2x'
 include ':main-extensions:mogo-module-main-independent'
 include ':main-extensions:mogo-module-main-launcher'
@@ -60,7 +57,6 @@ include ':modules:mogo-module-push'
 include ':modules:mogo-module-push-base'
 include ':modules:mogo-module-push-noop'
 
-include ':modules:mogo-module-guide'
 
 include ':libraries:tanlulib'
 include ':skin'