stash

2020-09-22 20:22:48 +08:00
parent a186f46b6c
commit eb511fa3c1
107 changed files with 1850 additions and 183 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -113,6 +113,8 @@ android {
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
            // 是否支持换肤
            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
        }
        // f系列-分体机
        f80x {
@@ -131,6 +133,8 @@ android {
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
            // 是否支持换肤
            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
        }
        // e系列，采用Launcher方案
        e8xx {
@@ -149,6 +153,8 @@ android {
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
            // 是否支持换肤
            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
        }
        // 同上
        em4 {
@@ -167,6 +173,8 @@ android {
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
            // 是否支持换肤
            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
        }
        // e系列-2+32，对标D系列2+32，采用独立app的形式
        em3 {
@@ -185,6 +193,8 @@ android {
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
            // 是否支持换肤
            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
        }
        // e系列-1+16，对标D系列1+16，采用独立app形式
        em1 {
@@ -203,6 +213,8 @@ android {
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
            // 是否支持换肤
            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
        }
        // d系列
        d8xx {
@@ -220,7 +232,9 @@ android {
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true'
            // 是否支持换肤
-            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
        }
        // d系列 2 + 32
        d80x {
@@ -238,7 +252,9 @@ android {
            // 是否加载引导模块
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true'
            // 是否支持换肤
-            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
+            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'true'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
        }
        // d系列 1+16 版本
        d82x {
@@ -257,6 +273,8 @@ android {
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'true'
            // 是否支持换肤
            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'true'
        }
        // 比亚迪
        bydauto {
@@ -275,6 +293,8 @@ android {
            buildConfigField 'boolean', 'LOAD_GUIDE_MODULE', 'false'
            // 是否支持换肤
            buildConfigField 'boolean', 'IS_SKIN_SUPPORTED', 'false'
+            // 是否支持查询导航目的地车友
+            buildConfigField 'boolean', 'IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST', 'false'
        }
        qa {
            dimension "env"
--- a/app/functions/skin.gradle
+++ b/app/functions/skin.gradle
@@ -1,13 +1,11 @@
-project.dependencies {
-
-    if (Boolean.valueOf(RELEASE)) {
+if (Boolean.valueOf(RELEASE)) {
        bydautoImplementation rootProject.ext.dependencies.skinsupportnoop
-        d8xxImplementation rootProject.ext.dependencies.skinsupportnoop
        d82xImplementation rootProject.ext.dependencies.skinsupportnoop
        em1Implementation rootProject.ext.dependencies.skinsupportnoop
-        d80xImplementation rootProject.ext.dependencies.skinsupportnoop
        em3Implementation rootProject.ext.dependencies.skinsupportnoop

+        d8xxImplementation rootProject.ext.dependencies.skinsupportimpl
+        d80xImplementation rootProject.ext.dependencies.skinsupportimpl
        f8xxImplementation rootProject.ext.dependencies.skinsupportimpl
        f80xImplementation rootProject.ext.dependencies.skinsupportimpl
        em4Implementation rootProject.ext.dependencies.skinsupportimpl
@@ -17,19 +15,21 @@ project.dependencies {
        f80xImplementation rootProject.ext.dependencies.skinsupportlight
        em4Implementation rootProject.ext.dependencies.skinsupportlight
        e8xxImplementation rootProject.ext.dependencies.skinsupportlight
-//        d8xxImplementation rootProject.ext.dependencies.skinsupportlight
+        d8xxImplementation rootProject.ext.dependencies.skinsupportlight
+        d80xImplementation rootProject.ext.dependencies.skinsupportlight
 //        d82xImplementation rootProject.ext.dependencies.skinsupportlight
 //        em1Implementation rootProject.ext.dependencies.skinsupportlight
-//        d80xImplementation rootProject.ext.dependencies.skinsupportlight
 //        em3Implementation rootProject.ext.dependencies.skinsupportlight
-    } else {
+} else {
+    project.dependencies {
+
        bydautoImplementation project(':skin:mogo-skin-support-noop')
-        d8xxImplementation project(':skin:mogo-skin-support-noop')
        d82xImplementation project(':skin:mogo-skin-support-noop')
        em1Implementation project(':skin:mogo-skin-support-noop')
-        d80xImplementation project(':skin:mogo-skin-support-noop')
        em3Implementation project(':skin:mogo-skin-support-noop')

+        d8xxImplementation project(':skin:mogo-skin-support-impl')
+        d80xImplementation project(':skin:mogo-skin-support-impl')
        f8xxImplementation project(':skin:mogo-skin-support-impl')
        f80xImplementation project(':skin:mogo-skin-support-impl')
        em4Implementation project(':skin:mogo-skin-support-impl')
@@ -39,10 +39,10 @@ project.dependencies {
        f80xImplementation project(':skin:mogo-skin-light')
        em4Implementation project(':skin:mogo-skin-light')
        e8xxImplementation project(':skin:mogo-skin-light')
-//        d8xxImplementation project(':skin:mogo-skin-light')
+        d8xxImplementation project(':skin:mogo-skin-light')
+        d80xImplementation project(':skin:mogo-skin-light')
 //        d82xImplementation project(':skin:mogo-skin-light')
 //        em1Implementation project(':skin:mogo-skin-light')
-//        d80xImplementation project(':skin:mogo-skin-light')
 //        em3Implementation project(':skin:mogo-skin-light')
    }
 }
--- a/app/functions/widgets.gradle
+++ b/app/functions/widgets.gradle
@@ -3,7 +3,9 @@
 project.dependencies {
    if (Boolean.valueOf(RELEASE)) {
        independentImplementation rootProject.ext.dependencies.mogomodulewidgets
+        implementation rootProject.ext.dependencies.mogomodulewidgets
    } else {
        independentImplementation project(':modules:mogo-module-widgets')
+        implementation project(':modules:mogo-module-widgets')
    }
 }
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -14,6 +14,7 @@ import com.mogo.commons.network.Utils;
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
 import com.mogo.module.back.BackToLauncherConst;
 import com.mogo.module.carchatting.card.CallChatConstant;
+import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.main.service.MogoMainService;
@@ -74,8 +75,8 @@ public class MogoApplication extends AbsMogoApplication {
            MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) );
            MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
        } else {
-            MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS ) );
        }
+        MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS ) );
        if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) {
            MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
        }
@@ -130,6 +131,7 @@ public class MogoApplication extends AbsMogoApplication {
        DebugConfig.setRoadEventAnimated( BuildConfig.ROAD_EVENT_ANIMATED );
        DebugConfig.setLoadGuideModule( BuildConfig.LOAD_GUIDE_MODULE );
        DebugConfig.setSkinSupported( BuildConfig.IS_SKIN_SUPPORTED );
+        DebugConfig.setSupportedSearchDestinationOnlineCarList( BuildConfig.IS_SUPPORTED_SEARCH_DESTINATION_ONLINE_CAR_LIST );
    }

    @Override
@@ -140,7 +142,7 @@ public class MogoApplication extends AbsMogoApplication {
    @Override
    protected void init() {
        super.init();
-        final IMogoServiceApis apis = ARouter.getInstance().navigation( IMogoServiceApis.class );
+        final IMogoServiceApis apis = MogoApisHandler.getInstance().getApis();
        prepareBaseService( apis, 2_000L );
 //        installSkinManager( this, apis );
    }