diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 407bc58beb..97996e66c3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -27,8 +27,6 @@
-
-
@@ -46,6 +44,8 @@
+
+
diff --git a/app/build.gradle b/app/build.gradle
index 1b14cbffa4..4daf85ccf4 100644
--- a/app/build.gradle
+++ b/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')
}
}
diff --git a/config.gradle b/config.gradle
index a1a859ba51..683dc75b5c 100644
--- a/config.gradle
+++ b/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}",
]
}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 4601487404..4a8a7de457 100644
--- a/gradle.properties
+++ b/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
diff --git a/modules/mogo-module-byd-noop/src/main/java/com/zhidao/mogo/module/byd/BydConst.kt b/modules/mogo-module-byd-noop/src/main/java/com/zhidao/mogo/module/byd/BydConst.kt
deleted file mode 100644
index e3c29c6fa0..0000000000
--- a/modules/mogo-module-byd-noop/src/main/java/com/zhidao/mogo/module/byd/BydConst.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.zhidao.mogo.module.byd
-
-object BydConst {
- const val MODULE_NAME = "MODULE_BYD"
- const val PATH_NAME = "/carmachine/byd"
-}
\ No newline at end of file
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 735adba0dd..665765305f 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
@@ -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
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 f926ded326..c07373d5d7 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
@@ -76,5 +76,5 @@ public interface MogoModulesHandler {
* 加载比亚迪模块
* @param containerId
*/
- void loadBydModule(int 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 4d15784d5c..289e76249d 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
@@ -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 );
}
diff --git a/modules/mogo-module-byd-noop/.gitignore b/modules/mogo-module-splash-noop/.gitignore
similarity index 100%
rename from modules/mogo-module-byd-noop/.gitignore
rename to modules/mogo-module-splash-noop/.gitignore
diff --git a/modules/mogo-module-byd-noop/build.gradle b/modules/mogo-module-splash-noop/build.gradle
similarity index 100%
rename from modules/mogo-module-byd-noop/build.gradle
rename to modules/mogo-module-splash-noop/build.gradle
diff --git a/modules/mogo-module-byd-noop/consumer-rules.pro b/modules/mogo-module-splash-noop/consumer-rules.pro
similarity index 100%
rename from modules/mogo-module-byd-noop/consumer-rules.pro
rename to modules/mogo-module-splash-noop/consumer-rules.pro
diff --git a/modules/mogo-module-byd-noop/gradle.properties b/modules/mogo-module-splash-noop/gradle.properties
similarity index 51%
rename from modules/mogo-module-byd-noop/gradle.properties
rename to modules/mogo-module-splash-noop/gradle.properties
index 7b70506f76..33dc22af32 100644
--- a/modules/mogo-module-byd-noop/gradle.properties
+++ b/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
diff --git a/modules/mogo-module-byd-noop/proguard-rules.pro b/modules/mogo-module-splash-noop/proguard-rules.pro
similarity index 100%
rename from modules/mogo-module-byd-noop/proguard-rules.pro
rename to modules/mogo-module-splash-noop/proguard-rules.pro
diff --git a/modules/mogo-module-byd-noop/src/androidTest/java/com/zhidao/mogo/module/byd/ExampleInstrumentedTest.kt b/modules/mogo-module-splash-noop/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt
similarity index 94%
rename from modules/mogo-module-byd-noop/src/androidTest/java/com/zhidao/mogo/module/byd/ExampleInstrumentedTest.kt
rename to modules/mogo-module-splash-noop/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt
index 01c06de1ae..b0d35cfd07 100644
--- a/modules/mogo-module-byd-noop/src/androidTest/java/com/zhidao/mogo/module/byd/ExampleInstrumentedTest.kt
+++ b/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
diff --git a/modules/mogo-module-byd/src/main/AndroidManifest.xml b/modules/mogo-module-splash-noop/src/main/AndroidManifest.xml
similarity index 65%
rename from modules/mogo-module-byd/src/main/AndroidManifest.xml
rename to modules/mogo-module-splash-noop/src/main/AndroidManifest.xml
index 42444963be..3934e57e9d 100644
--- a/modules/mogo-module-byd/src/main/AndroidManifest.xml
+++ b/modules/mogo-module-splash-noop/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
+ package="com.zhidao.mogo.module.splash">
/
\ No newline at end of file
diff --git a/modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/BydConst.kt b/modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt
similarity index 73%
rename from modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/BydConst.kt
rename to modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt
index e3c29c6fa0..74536ca572 100644
--- a/modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/BydConst.kt
+++ b/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"
diff --git a/modules/mogo-module-byd-noop/src/main/java/com/zhidao/mogo/module/byd/BydProvider.kt b/modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt
similarity index 91%
rename from modules/mogo-module-byd-noop/src/main/java/com/zhidao/mogo/module/byd/BydProvider.kt
rename to modules/mogo-module-splash-noop/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt
index d0eeddc62f..9b134711e7 100644
--- a/modules/mogo-module-byd-noop/src/main/java/com/zhidao/mogo/module/byd/BydProvider.kt
+++ b/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
diff --git a/modules/mogo-module-byd-noop/src/test/java/com/zhidao/mogo/module/byd/ExampleUnitTest.kt b/modules/mogo-module-splash-noop/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt
similarity index 89%
rename from modules/mogo-module-byd-noop/src/test/java/com/zhidao/mogo/module/byd/ExampleUnitTest.kt
rename to modules/mogo-module-splash-noop/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt
index 66e978041b..35aae2dff8 100644
--- a/modules/mogo-module-byd-noop/src/test/java/com/zhidao/mogo/module/byd/ExampleUnitTest.kt
+++ b/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
diff --git a/modules/mogo-module-byd/.gitignore b/modules/mogo-module-splash/.gitignore
similarity index 100%
rename from modules/mogo-module-byd/.gitignore
rename to modules/mogo-module-splash/.gitignore
diff --git a/modules/mogo-module-byd/build.gradle b/modules/mogo-module-splash/build.gradle
similarity index 100%
rename from modules/mogo-module-byd/build.gradle
rename to modules/mogo-module-splash/build.gradle
diff --git a/modules/mogo-module-byd/consumer-rules.pro b/modules/mogo-module-splash/consumer-rules.pro
similarity index 100%
rename from modules/mogo-module-byd/consumer-rules.pro
rename to modules/mogo-module-splash/consumer-rules.pro
diff --git a/modules/mogo-module-byd/gradle.properties b/modules/mogo-module-splash/gradle.properties
similarity index 55%
rename from modules/mogo-module-byd/gradle.properties
rename to modules/mogo-module-splash/gradle.properties
index a829812ae7..4c41034d70 100644
--- a/modules/mogo-module-byd/gradle.properties
+++ b/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
diff --git a/modules/mogo-module-byd/proguard-rules.pro b/modules/mogo-module-splash/proguard-rules.pro
similarity index 100%
rename from modules/mogo-module-byd/proguard-rules.pro
rename to modules/mogo-module-splash/proguard-rules.pro
diff --git a/modules/mogo-module-byd/src/androidTest/java/com/zhidao/mogo/module/byd/ExampleInstrumentedTest.kt b/modules/mogo-module-splash/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt
similarity index 94%
rename from modules/mogo-module-byd/src/androidTest/java/com/zhidao/mogo/module/byd/ExampleInstrumentedTest.kt
rename to modules/mogo-module-splash/src/androidTest/java/com/zhidao/mogo/module/splash/ExampleInstrumentedTest.kt
index 01c06de1ae..b0d35cfd07 100644
--- a/modules/mogo-module-byd/src/androidTest/java/com/zhidao/mogo/module/byd/ExampleInstrumentedTest.kt
+++ b/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
diff --git a/modules/mogo-module-byd-noop/src/main/AndroidManifest.xml b/modules/mogo-module-splash/src/main/AndroidManifest.xml
similarity index 65%
rename from modules/mogo-module-byd-noop/src/main/AndroidManifest.xml
rename to modules/mogo-module-splash/src/main/AndroidManifest.xml
index 42444963be..3934e57e9d 100644
--- a/modules/mogo-module-byd-noop/src/main/AndroidManifest.xml
+++ b/modules/mogo-module-splash/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
+ package="com.zhidao.mogo.module.splash">
/
\ No newline at end of file
diff --git a/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydConst.kt
new file mode 100644
index 0000000000..127a37c7d8
--- /dev/null
+++ b/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"
+}
\ No newline at end of file
diff --git a/modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/BydProvider.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt
similarity index 77%
rename from modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/BydProvider.kt
rename to modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/BydProvider.kt
index 0d5ac659e1..e3456e3130 100644
--- a/modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/BydProvider.kt
+++ b/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 {
diff --git a/modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/fragment/BydSplashFragment.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt
similarity index 76%
rename from modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/fragment/BydSplashFragment.kt
rename to modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt
index 3f9ebc4fb4..f1d48a718d 100644
--- a/modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/fragment/BydSplashFragment.kt
+++ b/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(){
diff --git a/modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/presenter/BydSplashPresenter.kt b/modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.kt
similarity index 53%
rename from modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/presenter/BydSplashPresenter.kt
rename to modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/presenter/BydSplashPresenter.kt
index 0941fb190d..b16df959c7 100644
--- a/modules/mogo-module-byd/src/main/java/com/zhidao/mogo/module/byd/presenter/BydSplashPresenter.kt
+++ b/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(view) {
}
\ No newline at end of file
diff --git a/modules/mogo-module-byd/src/main/res/drawable-xhdpi/binli.jpg b/modules/mogo-module-splash/src/main/res/drawable-xhdpi/binli.jpg
similarity index 100%
rename from modules/mogo-module-byd/src/main/res/drawable-xhdpi/binli.jpg
rename to modules/mogo-module-splash/src/main/res/drawable-xhdpi/binli.jpg
diff --git a/modules/mogo-module-byd/src/main/res/layout/fragment_byd_splash.xml b/modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml
similarity index 100%
rename from modules/mogo-module-byd/src/main/res/layout/fragment_byd_splash.xml
rename to modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml
diff --git a/modules/mogo-module-byd/src/test/java/com/zhidao/mogo/module/byd/ExampleUnitTest.kt b/modules/mogo-module-splash/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt
similarity index 89%
rename from modules/mogo-module-byd/src/test/java/com/zhidao/mogo/module/byd/ExampleUnitTest.kt
rename to modules/mogo-module-splash/src/test/java/com/zhidao/mogo/module/splash/ExampleUnitTest.kt
index 66e978041b..35aae2dff8 100644
--- a/modules/mogo-module-byd/src/test/java/com/zhidao/mogo/module/byd/ExampleUnitTest.kt
+++ b/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
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
index b170a01a6b..5a83ba8509 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
+++ b/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";
}
diff --git a/settings.gradle b/settings.gradle
index 2ba4d0dab3..517b853c59 100644
--- a/settings.gradle
+++ b/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'
diff --git a/upload.sh b/upload.sh
index cb03475f02..90133449ee 100755
--- a/upload.sh
+++ b/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