[Change]

更改应用身份标识为16进制 0x00 = 司机模式（默认） 0x01 = 乘客模式（部分功能受到影响） Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
2022-02-17 11:55:05 +08:00
parent b03ae9cb09
commit f18f7897cb
12 changed files with 19 additions and 19 deletions
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java
@@ -134,7 +134,7 @@ public class MogoOCHTaxiModelNew {

        if (NetworkUtils.isConnected(mContext)) {
 //            startOrStopOrderLoop(mOCHCarStatus == 1);
-            if (FunctionBuildConfig.appIdentityMode == 0) {
+            if (FunctionBuildConfig.appIdentityMode == 0x00) {
                queryCarStatus();
            }
        }
@@ -821,7 +821,7 @@ public class MogoOCHTaxiModelNew {
            Logger.d( TAG, "onIntentReceived = %s", intentStr );
            if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) {
                if ( NetworkUtils.isConnected( mContext ) ) {
-                    if (FunctionBuildConfig.appIdentityMode == 0) {
+                    if (FunctionBuildConfig.appIdentityMode == 0x00) {
                        startOrStopOrderLoop(mOCHCarStatus == 1);
                        queryCarStatus();
                    }
@@ -941,7 +941,7 @@ public class MogoOCHTaxiModelNew {
                mPrevAPStatus = state;

                if (FunctionBuildConfig.isDemoMode
-                        && FunctionBuildConfig.appIdentityMode == 1) {
+                        && FunctionBuildConfig.appIdentityMode == 0x01) {
                    // 当美化模式（演示模式）开启时：且是乘客app、且未到终点时，维持自动驾驶icon开启状态
                    if (!arriveAtEnd) {
                        return;
@@ -955,7 +955,7 @@ public class MogoOCHTaxiModelNew {
                mPrevAPStatus = state;

                if (FunctionBuildConfig.isDemoMode
-                        && FunctionBuildConfig.appIdentityMode == 1) {
+                        && FunctionBuildConfig.appIdentityMode == 0x01) {
                    // 当美化模式（演示模式）开启时：且是乘客app、且未到终点时，维持自动驾驶icon开启状态
                    if (!arriveAtEnd) {
                        return;
@@ -981,7 +981,7 @@ public class MogoOCHTaxiModelNew {
        @Override
        public void onAutopilotArriveAtStation(@Nullable AutopilotStationInfo data) {
            if (FunctionBuildConfig.isDemoMode
-                    && FunctionBuildConfig.appIdentityMode == 1) {
+                    && FunctionBuildConfig.appIdentityMode == 0x01) {
                arriveAtEnd = true;
            }

--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/BaseOchTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/BaseOchTaxiTabFragment.java
@@ -133,7 +133,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
            @Override
            public void onClickImpl(View v) {
                // 如果能自动驾驶，就自动驾驶，不能就提示
-                if (FunctionBuildConfig.appIdentityMode == 0) {
+                if (FunctionBuildConfig.appIdentityMode == 0x00) {
                    restartAutopilot();
                }
                // TODO: 2021/11/27 通过开启结果更新ui
@@ -220,7 +220,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
            showNaviToStartStationFragment(false);
        });

-        if (FunctionBuildConfig.appIdentityMode == 1) {
+        if (FunctionBuildConfig.appIdentityMode == 0x01) {
            flStationPanelContainer.setVisibility(View.GONE);
            tvOperationStatus.setVisibility(View.GONE);
            mSettingBtn.setVisibility(View.GONE);
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OCHTaxiFragment.java
@@ -85,7 +85,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
            switchVRFlatMode(false);
        }

-        if (FunctionBuildConfig.appIdentityMode == 0) {
+        if (FunctionBuildConfig.appIdentityMode == 0x00) {
            tvOperationStatus.setVisibility(View.VISIBLE);
        } else {
            tvOperationStatus.setVisibility(View.GONE);
--- a/app/productFlavors/f8xx.gradle
+++ b/app/productFlavors/f8xx.gradle
@@ -27,7 +27,7 @@ project.android.productFlavors {
        buildConfigField 'int', 'GPS_PROVIDER', "1"

        // 构建的应用身份类型，司机｜乘客
-        buildConfigField 'int', 'APP_IDENTITY_MODE', "0"
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
        // 构建的是否是演示（美化）模式
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
    }
--- a/app/productFlavors/fPadLenovo.gradle
+++ b/app/productFlavors/fPadLenovo.gradle
@@ -27,7 +27,7 @@ project.android.productFlavors {
        buildConfigField 'int', 'GPS_PROVIDER', "1"

        // 构建的应用身份类型，司机｜乘客
-        buildConfigField 'int', 'APP_IDENTITY_MODE', "-1"
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
        // 构建的是否是演示（美化）模式
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
    }
--- a/app/productFlavors/fPadLenovoOchBus.gradle
+++ b/app/productFlavors/fPadLenovoOchBus.gradle
@@ -29,7 +29,7 @@ project.android.productFlavors {
        buildConfigField 'int', 'GPS_PROVIDER', "1"

        // 构建的应用身份类型，司机｜乘客
-        buildConfigField 'int', 'APP_IDENTITY_MODE', "0"
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
        // 构建的是否是演示（美化）模式
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
    }
--- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle
+++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle
@@ -27,7 +27,7 @@ project.android.productFlavors {
        buildConfigField 'int', 'GPS_PROVIDER', "1"

        // 构建的应用身份类型，司机0｜乘客1
-        buildConfigField 'int', 'APP_IDENTITY_MODE', "1"
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0x01"
        // 构建的是否是演示（美化）模式
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
    }
--- a/app/productFlavors/fPadLenovoOchTaxi.gradle
+++ b/app/productFlavors/fPadLenovoOchTaxi.gradle
@@ -30,7 +30,7 @@ project.android.productFlavors {
        buildConfigField 'int', 'GPS_PROVIDER', "1"

        // 构建的应用身份类型，司机｜乘客
-        buildConfigField 'int', 'APP_IDENTITY_MODE', "0"
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
        // 构建的是否是演示（美化）模式
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
    }
--- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
+++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
@@ -29,7 +29,7 @@ project.android.productFlavors {
        buildConfigField 'int', 'GPS_PROVIDER', "1"

        // 构建的应用身份类型，司机0｜乘客1
-        buildConfigField 'int', 'APP_IDENTITY_MODE', "1"
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0x01"
        // 构建的是否是演示（美化）模式
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
    }
--- a/app/productFlavors/fochbus.gradle
+++ b/app/productFlavors/fochbus.gradle
@@ -27,7 +27,7 @@ project.android.productFlavors {
        buildConfigField 'int', 'GPS_PROVIDER', "1"

        // 构建的应用身份类型，司机｜乘客
-        buildConfigField 'int', 'APP_IDENTITY_MODE', "0"
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
        // 构建的是否是演示（美化）模式
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
    }
--- a/app/productFlavors/fochtaxi.gradle
+++ b/app/productFlavors/fochtaxi.gradle
@@ -27,7 +27,7 @@ project.android.productFlavors {
        buildConfigField 'int', 'GPS_PROVIDER', "1"

        // 构建的应用身份类型，司机｜乘客
-        buildConfigField 'int', 'APP_IDENTITY_MODE', "0"
+        buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
        // 构建的是否是演示（美化）模式
        buildConfigField 'boolean', 'IS_DEMO_MODE', 'true'
    }
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -19,11 +19,11 @@ object FunctionBuildConfig {

    /**
     * 当前APP的身份模式
-     * 0 = 司机模式（默认）
-     * 1 = 乘客模式（部分功能受到影响）
+     * 0x00 = 司机模式（默认）
+     * 0x01 = 乘客模式（部分功能受到影响）
     */
    @JvmField
-    var appIdentityMode = 0
+    var appIdentityMode = 0x00

    /**
     * 自车位置使用哪种外部数据源