修改module-byd为module-splash，暂未使用module-splash-noop模块

.idea/gradle.xml

@@ -27,8 +27,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-apps" />
             <option value="$PROJECT_DIR$/modules/mogo-module-authorize" />
             <option value="$PROJECT_DIR$/modules/mogo-module-back" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-byd" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-byd-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-common" />
             <option value="$PROJECT_DIR$/modules/mogo-module-event-panel" />
             <option value="$PROJECT_DIR$/modules/mogo-module-event-panel-noop" />
@@ -46,6 +44,8 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-search" />
             <option value="$PROJECT_DIR$/modules/mogo-module-service" />
             <option value="$PROJECT_DIR$/modules/mogo-module-share" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-splash" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-splash-noop" />
             <option value="$PROJECT_DIR$/services" />
             <option value="$PROJECT_DIR$/services/mogo-service" />
             <option value="$PROJECT_DIR$/services/mogo-service-api" />

app/build.gradle

@@ -265,6 +265,7 @@ dependencies {
         releaseImplementation rootProject.ext.dependencies.gpssimulatornoop
         implementation rootProject.ext.dependencies.modulemedia
         implementation rootProject.ext.dependencies.moduleservice
+        implementation rootProject.ext.dependencies.modulesplash
         // 事件面板分渠道引用
         d82xImplementation rootProject.ext.dependencies.moduleventpanelnoop
         em1Implementation rootProject.ext.dependencies.moduleventpanelnoop
@@ -284,16 +285,6 @@ dependencies {
         e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
         f8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
         em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop
-        // 比亚迪模块引用
-        bydImplementation rootProject.ext.dependencies.modulebyd
-        d82xImplementation rootProject.ext.dependencies.modulebydnoop
-        em1Implementation rootProject.ext.dependencies.modulebydnoop
-        d8xxImplementation rootProject.ext.dependencies.modulebydnoop
-        em4Implementation rootProject.ext.dependencies.modulebydnoop
-        e8xxImplementation rootProject.ext.dependencies.modulebydnoop
-        e8xxImplementation rootProject.ext.dependencies.modulebydnoop
-        f8xxImplementation rootProject.ext.dependencies.modulebydnoop
-        em3Implementation rootProject.ext.dependencies.modulebydnoop
     } else {
         launcherImplementation project(':main-extensions:mogo-module-main-launcher')
 //        launcherImplementation project(':modules:mogo-module-main')
@@ -307,6 +298,7 @@ dependencies {
         releaseImplementation project(':modules:mogo-module-gps-simulator-noop')
         implementation project(':modules:mogo-module-media')
         implementation project(':modules:mogo-module-service')
+        implementation project(':modules:mogo-module-splash')
         // 事件面板分渠道引用
         d82xImplementation project(':modules:mogo-module-event-panel-noop')
         em1Implementation project(':modules:mogo-module-event-panel-noop')
@@ -325,16 +317,6 @@ dependencies {
         e8xxImplementation project(':modules:mogo-module-left-panel-noop')
         f8xxImplementation project(':modules:mogo-module-left-panel-noop')
         em3Implementation project(':modules:mogo-module-left-panel-noop')
-        // 比亚迪模块引用
-        bydImplementation project(':modules:mogo-module-byd')
-        d82xImplementation project(':modules:mogo-module-byd-noop')
-        em1Implementation project(':modules:mogo-module-byd-noop')
-        d8xxImplementation project(':modules:mogo-module-byd-noop')
-        em4Implementation project(':modules:mogo-module-byd-noop')
-        e8xxImplementation project(':modules:mogo-module-byd-noop')
-        e8xxImplementation project(':modules:mogo-module-byd-noop')
-        f8xxImplementation project(':modules:mogo-module-byd-noop')
-        em3Implementation project(':modules:mogo-module-byd-noop')
     }
 }
 

config.gradle

@@ -170,9 +170,7 @@ ext {
             moduleleftpanel          : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}",
             // 左侧面板空实现
             moduleleftpanelnoop      : "com.mogo.module:module-left-panel-noop:${MOGO_MODULE_LEFT_PANEL_VERSION}",
-            // 比亚迪
-            modulebyd                : "com.mogo.module:module-byd:${MOGO_MODULE_BYD_VERSION}",
-            // 比亚迪空实现
-            modulebydnoop            : "com.mogo.module:module-byd-noop:${MOGO_MODULE_BYD_NOOP_VERSION}"
+            // 闪屏页
+            modulesplash             : "com.mogo.module:module-splash:${MOGO_MODULE_SPLASH_VERSION}",
     ]
 }

gradle.properties

@@ -24,36 +24,36 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
 USERNAME=xintai
 PASSWORD=xintai2018
 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
-RELEASE=false
+RELEASE=true
 # 模块版本
 ## 工程内模块
-MOGO_COMMONS_VERSION=1.2.1.16
-MOGO_UTILS_VERSION=1.2.1.16
-MAP_AMAP_VERSION=1.2.1.16
-MAP_AUTONAVI_VERSION=1.2.1.16
-MOGO_MAP_VERSION=1.2.1.16
-MOGO_MAP_API_VERSION=1.2.1.16
-MOGO_SERVICE_VERSION=1.2.1.16
-MOGO_SERVICE_API_VERSION=1.2.1.16
-MOGO_CONNECTION_VERSION=1.2.1.16
-MOGO_MODULE_APPS_VERSION=1.2.1.16
-MOGO_MODULE_NAVI_VERSION=1.2.1.16
-MOGO_MODULE_SHARE_VERSION=1.2.1.16
-MOGO_MODULE_COMMON_VERSION=1.2.1.16
-MOGO_MODULE_MAIN_VERSION=1.2.1.16
-MOGO_MODULE_MAP_VERSION=1.2.1.16
-MOGO_MODULE_SERVICE_VERSION=1.2.1.16
-MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.16
-MOGO_MODULE_SEARCH_VERSION=1.2.1.16
-MOGO_MODULE_BACK_VERSION=1.2.1.16
-MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.16
-MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.16
-MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.16
-MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.16
-MOGO_MODULE_GUIDE_VERSION=1.2.1.16
-MOGO_MODULE_MEDIA_VERSION=1.2.1.16
-MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.16
-MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.16
+MOGO_COMMONS_VERSION=1.2.1.17
+MOGO_UTILS_VERSION=1.2.1.17
+MAP_AMAP_VERSION=1.2.1.17
+MAP_AUTONAVI_VERSION=1.2.1.17
+MOGO_MAP_VERSION=1.2.1.17
+MOGO_MAP_API_VERSION=1.2.1.17
+MOGO_SERVICE_VERSION=1.2.1.17
+MOGO_SERVICE_API_VERSION=1.2.1.17
+MOGO_CONNECTION_VERSION=1.2.1.17
+MOGO_MODULE_APPS_VERSION=1.2.1.17
+MOGO_MODULE_NAVI_VERSION=1.2.1.17
+MOGO_MODULE_SHARE_VERSION=1.2.1.17
+MOGO_MODULE_COMMON_VERSION=1.2.1.17
+MOGO_MODULE_MAIN_VERSION=1.2.1.17
+MOGO_MODULE_MAP_VERSION=1.2.1.17
+MOGO_MODULE_SERVICE_VERSION=1.2.1.17
+MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.17
+MOGO_MODULE_SEARCH_VERSION=1.2.1.17
+MOGO_MODULE_BACK_VERSION=1.2.1.17
+MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.17
+MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.17
+MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.17
+MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.17
+MOGO_MODULE_GUIDE_VERSION=1.2.1.17
+MOGO_MODULE_MEDIA_VERSION=1.2.1.17
+MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.17
+MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.17
 
 ## 工程外部模块
 # 探路
@@ -92,9 +92,8 @@ HOOKPLUGIN_VERSION=1.0.0
 # obu
 MOGO_MODULE_OBU_VERSION = 1.2.1.10-SNAPSHOT
 
-# 比亚迪
-MOGO_MODULE_BYD_VERSION = 1.0.0-SNAPSHOT
-MOGO_MODULE_BYD_NOOP_VERSION = 1.0.0-SNAPSHOT
+# 闪屏页
+MOGO_MODULE_SPLASH_VERSION = 1.0.0-SNAPSHOT
 
 ## 产品库必备配置
 applicationId=com.mogo.launcer

modules/mogo-module-byd-noop/src/main/java/com/zhidao/mogo/module/byd/BydConst.kt

@@ -1,6 +0,0 @@
-package com.zhidao.mogo.module.byd
-
-object BydConst {
-    const val MODULE_NAME = "MODULE_BYD"
-    const val PATH_NAME = "/carmachine/byd"
-}

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

@@ -207,7 +207,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
 
     @Override
     public void loadSplash() {
-        MogoModulesManager.getInstance().loadBydModule(R.id.module_main_id_splash_container);
+        MogoModulesManager.getInstance().loadSplashModule(R.id.module_main_id_splash_container);
     }
 
     @NonNull

modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesHandler.java

@@ -76,5 +76,5 @@ public interface MogoModulesHandler {
      * 加载比亚迪模块
      * @param containerId
      */
-    void loadBydModule(int containerId);
+    void loadSplashModule(int containerId);
 }

modules/mogo-module-main/src/main/java/com/mogo/module/main/cards/MogoModulesManager.java

@@ -8,7 +8,6 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.extensions.ExtensionsModuleConst;
-import com.mogo.module.main.EventDispatchCenter;
 import com.mogo.module.main.MainActivity;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
@@ -148,9 +147,9 @@ public class MogoModulesManager implements MogoModulesHandler {
     }
 
     @Override
-    public void loadBydModule(int containerId) {
+    public void loadSplashModule(int containerId) {
         IMogoModuleProvider provider = ( IMogoModuleProvider ) ARouter.getInstance()
-                .build(MogoServicePaths.PATH_BYD)
+                .build(MogoServicePaths.PATH_SPLASH)
                 .navigation( getContext() );
         addFragment( provider, containerId );
     }

modules/mogo-module-splash-noop/gradle.properties

@@ -1,3 +1,3 @@
 GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-byd-noop
+POM_ARTIFACT_ID=module-splash-noop
 VERSION_CODE=1

modules/mogo-module-splash-noop/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.zhidao.mogo.module.byd
+package com.zhidao.mogo.module.splash
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

modules/mogo-module-splash-noop/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zhidao.mogo.module.byd">
+    package="com.zhidao.mogo.module.splash">
 
     /
 </manifest>

modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt

@@ -1,4 +1,4 @@
-package com.zhidao.mogo.module.byd
+package com.zhidao.mogo.module.splash
 
 object BydConst {
     const val MODULE_NAME = "MODULE_BYD"

modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt

@@ -1,4 +1,4 @@
-package com.zhidao.mogo.module.byd
+package com.zhidao.mogo.module.splash
 
 import android.content.Context
 import android.os.Bundle
@@ -12,8 +12,8 @@ import com.mogo.map.navi.IMogoNaviListener
 import com.mogo.service.module.IMogoModuleLifecycle
 import com.mogo.service.module.IMogoModuleProvider
 import com.mogo.utils.logger.Logger
-import com.zhidao.mogo.module.byd.BydConst.MODULE_NAME
-import com.zhidao.mogo.module.byd.BydConst.PATH_NAME
+import com.zhidao.mogo.module.splash.BydConst.MODULE_NAME
+import com.zhidao.mogo.module.splash.BydConst.PATH_NAME
 
 /**
  * 比亚迪车机provider

modules/mogo-module-splash-noop/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.zhidao.mogo.module.byd
+package com.zhidao.mogo.module.splash
 
 import org.junit.Test
 

modules/mogo-module-splash/gradle.properties

@@ -1,3 +1,3 @@
 GROUP=com.mogo.module
-POM_ARTIFACT_ID=module-byd
+POM_ARTIFACT_ID=module-splash
 VERSION_CODE=1

modules/mogo-module-splash/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.zhidao.mogo.module.byd
+package com.zhidao.mogo.module.splash
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

modules/mogo-module-splash/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zhidao.mogo.module.byd">
+    package="com.zhidao.mogo.module.splash">
 
     /
 </manifest>

modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt

@@ -0,0 +1,6 @@
+package com.zhidao.mogo.module.splash
+
+object BydConst {
+    const val MODULE_NAME = "MODULE_SPLASH"
+    const val PATH_NAME = "/splash/api"
+}

modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt

@@ -1,10 +1,11 @@
-package com.zhidao.mogo.module.byd
+package com.zhidao.mogo.module.splash
 
 import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.map.listener.IMogoMapListener
 import com.mogo.map.location.IMogoLocationListener
 import com.mogo.map.marker.IMogoMarkerClickListener
@@ -12,9 +13,9 @@ import com.mogo.map.navi.IMogoNaviListener
 import com.mogo.service.module.IMogoModuleLifecycle
 import com.mogo.service.module.IMogoModuleProvider
 import com.mogo.utils.logger.Logger
-import com.zhidao.mogo.module.byd.BydConst.MODULE_NAME
-import com.zhidao.mogo.module.byd.BydConst.PATH_NAME
-import com.zhidao.mogo.module.byd.fragment.BydSplashFragment
+import com.zhidao.mogo.module.splash.BydConst.MODULE_NAME
+import com.zhidao.mogo.module.splash.BydConst.PATH_NAME
+import com.zhidao.mogo.module.splash.fragment.BydSplashFragment
 
 /**
  * 比亚迪车机provider
@@ -22,7 +23,7 @@ import com.zhidao.mogo.module.byd.fragment.BydSplashFragment
  * @author tongchenfei
  */
 @Route(path = PATH_NAME)
-class BydProvider:IMogoModuleProvider {
+class BydProvider : IMogoModuleProvider {
     override fun getNaviListener(): IMogoNaviListener? {
         return null
     }
@@ -55,8 +56,10 @@ class BydProvider:IMogoModuleProvider {
         return null
     }
 
-    override fun createFragment(context: Context?, data: Bundle?): Fragment? {
-        return BydSplashFragment()
+    override fun createFragment(context: Context?, data: Bundle?): Fragment? = if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD) {
+        BydSplashFragment()
+    } else {
+        null
     }
 
     override fun getModuleName(): String {

modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt

@@ -1,8 +1,8 @@
-package com.zhidao.mogo.module.byd.fragment
+package com.zhidao.mogo.module.splash.fragment
 
 import com.mogo.commons.mvp.MvpFragment
-import com.zhidao.mogo.module.byd.R
-import com.zhidao.mogo.module.byd.presenter.BydSplashPresenter
+import com.zhidao.mogo.module.splash.R
+import com.zhidao.mogo.module.splash.presenter.BydSplashPresenter
 import kotlinx.android.synthetic.main.fragment_byd_splash.*
 
 class BydSplashFragment :MvpFragment<BydSplashFragment,BydSplashPresenter>(){

modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.kt

@@ -1,7 +1,7 @@
-package com.zhidao.mogo.module.byd.presenter
+package com.zhidao.mogo.module.splash.presenter
 
 import com.mogo.commons.mvp.Presenter
-import com.zhidao.mogo.module.byd.fragment.BydSplashFragment
+import com.zhidao.mogo.module.splash.fragment.BydSplashFragment
 
 class BydSplashPresenter(view: BydSplashFragment) : Presenter<BydSplashFragment>(view) {
 }

modules/mogo-module-splash/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt

@@ -1,4 +1,4 @@
-package com.zhidao.mogo.module.byd
+package com.zhidao.mogo.module.splash
 
 import org.junit.Test
 

services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java

@@ -207,5 +207,5 @@ public class MogoServicePaths {
      * 比亚迪模块
      */
     @Deprecated
-    public static final String PATH_BYD = "/carmachine/byd";
+    public static final String PATH_SPLASH = "/splash/api";
 }

settings.gradle

@@ -1,5 +1,5 @@
-include ':modules:mogo-module-byd-noop'
-include ':modules:mogo-module-byd'
+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-event-panel-noop'

upload.sh

@@ -32,5 +32,4 @@
 ./gradlew :modules:mogo-module-left-panel:clean  :modules:mogo-module-left-panel:uploadArchives
 ./gradlew :modules:mogo-module-left-panel-noop:clean  :modules:mogo-module-left-panel-noop:uploadArchives
 ./gradlew :modules:mogo-module-byd:clean  :modules:mogo-module-byd:uploadArchives
-./gradlew :modules:mogo-module-byd-noop:clean  :modules:mogo-module-byd-noop:uploadArchives