[m1]

[1.0.2] [添加状态栏替换开关]
2023-02-16 17:04:11 +08:00
parent aaf16795cb
commit 09485a49dc
15 changed files with 47 additions and 1 deletions
--- a/app/productFlavors/fMultiDisplayOchBus.gradle
+++ b/app/productFlavors/fMultiDisplayOchBus.gradle
@@ -40,6 +40,8 @@ project.android.productFlavors {
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'
--- a/app/productFlavors/fMultiDisplayOchTaxi.gradle
+++ b/app/productFlavors/fMultiDisplayOchTaxi.gradle
@@ -42,6 +42,9 @@ project.android.productFlavors {
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
+

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'
--- a/app/productFlavors/fOchBus.gradle
+++ b/app/productFlavors/fOchBus.gradle
@@ -43,6 +43,8 @@ project.android.productFlavors {
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
--- a/app/productFlavors/fOchBusPassenger.gradle
+++ b/app/productFlavors/fOchBusPassenger.gradle
@@ -38,6 +38,8 @@ project.android.productFlavors {
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'


        // 构建 是否支持多屏异显异交互
--- a/app/productFlavors/fOchBusPassengerM1.gradle
+++ b/app/productFlavors/fOchBusPassengerM1.gradle
@@ -43,6 +43,8 @@ project.android.productFlavors {
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'false'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
--- a/app/productFlavors/fOchBusPassengerM2.gradle
+++ b/app/productFlavors/fOchBusPassengerM2.gradle
@@ -39,6 +39,9 @@ project.android.productFlavors {

        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'true'
+

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
--- a/app/productFlavors/fOchShuttle.gradle
+++ b/app/productFlavors/fOchShuttle.gradle
@@ -40,6 +40,9 @@ project.android.productFlavors {

        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
+

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
--- a/app/productFlavors/fOchShuttlePassenger.gradle
+++ b/app/productFlavors/fOchShuttlePassenger.gradle
@@ -33,6 +33,11 @@ project.android.productFlavors {
        buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
        // 构建的是否是演示（美化）模式
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
+        // 构建的是否要动态更换模型
+        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
+

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
--- a/app/productFlavors/fOchSweeper.gradle
+++ b/app/productFlavors/fOchSweeper.gradle
@@ -43,6 +43,9 @@ project.android.productFlavors {
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'
+

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
--- a/app/productFlavors/fOchTaxi.gradle
+++ b/app/productFlavors/fOchTaxi.gradle
@@ -44,6 +44,8 @@ project.android.productFlavors {
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
--- a/app/productFlavors/fOchTaxiPassenger.gradle
+++ b/app/productFlavors/fOchTaxiPassenger.gradle
@@ -43,6 +43,8 @@ project.android.productFlavors {
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'true'
--- a/app/productFlavors/fPadLenovo.gradle
+++ b/app/productFlavors/fPadLenovo.gradle
@@ -40,6 +40,8 @@ project.android.productFlavors {
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'false'
        // 构建的是否要动态更换模型
        buildConfigField 'boolean', 'IS_CAR_MODEL_CHANGE', 'true'
+        // 是否需要重写状态栏
+        buildConfigField 'boolean', 'IS_REPLACE_STATUSVIEW', 'false'

        // 构建 是否支持多屏异显异交互
        buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false'
--- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
+++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
@@ -74,6 +74,7 @@ object ConfigStartUp {
        DebugConfig.setMapOptVersion(BuildConfig.MAP_SDK_OPT_VERSION)
        DebugConfig.setMultiDisplay(BuildConfig.IS_MULTI_DISPLAY)
        DebugConfig.setCarModelChange(BuildConfig.IS_CAR_MODEL_CHANGE)
+        DebugConfig.setReplaceStatusview(BuildConfig.IS_REPLACE_STATUSVIEW)
    }

    private fun initOtherConfig(context: Context) {
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiFloatViewManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiFloatViewManager.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.view.View
 import android.widget.FrameLayout
 import com.alibaba.android.arouter.launcher.ARouter
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_FLOAT_VIEW_MANAGER
 import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_STATUS_VIEW_MANAGER
 import com.mogo.eagle.core.function.api.hmi.view.IStatusViewLayout
@@ -30,6 +31,10 @@ object CallerHmiFloatViewManager {
    }

    fun getView(context:Context):View?{
-        return statusViewProviderApi?.getStatusView(context)
+        return if (DebugConfig.isReplaceStatusview()){
+            statusViewProviderApi?.getStatusView(context)
+        }else{
+            null
+        }
    }
 }
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
@@ -189,4 +189,13 @@ public class DebugConfig {
    public static boolean isCarModelChange() {
        return isCarModelChange;
    }
+
+    private static boolean isReplaceStatusview = true;
+    public static void setReplaceStatusview(boolean status) {
+        isReplaceStatusview = status;
+    }
+
+    public static boolean isReplaceStatusview() {
+        return isReplaceStatusview;
+    }
 }