From f18f7897cb117afe673eae53f31790639bce2300 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Thu, 17 Feb 2022 11:55:05 +0800 Subject: [PATCH] =?UTF-8?q?[Change]=20=E6=9B=B4=E6=94=B9=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E6=A0=87=E8=AF=86=E4=B8=BA16=E8=BF=9B?= =?UTF-8?q?=E5=88=B6=200x00=20=3D=20=E5=8F=B8=E6=9C=BA=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=EF=BC=88=E9=BB=98=E8=AE=A4=EF=BC=89=200x01=20=3D=20=E4=B9=98?= =?UTF-8?q?=E5=AE=A2=E6=A8=A1=E5=BC=8F=EF=BC=88=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8F=97=E5=88=B0=E5=BD=B1=E5=93=8D=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../och/taxi/passenger/model/MogoOCHTaxiModelNew.java | 10 +++++----- .../och/taxi/passenger/ui/BaseOchTaxiTabFragment.java | 4 ++-- .../mogo/och/taxi/passenger/ui/OCHTaxiFragment.java | 2 +- app/productFlavors/f8xx.gradle | 2 +- app/productFlavors/fPadLenovo.gradle | 2 +- app/productFlavors/fPadLenovoOchBus.gradle | 2 +- app/productFlavors/fPadLenovoOchBusPassenger.gradle | 2 +- app/productFlavors/fPadLenovoOchTaxi.gradle | 2 +- app/productFlavors/fPadLenovoOchTaxiPassenger.gradle | 2 +- app/productFlavors/fochbus.gradle | 2 +- app/productFlavors/fochtaxi.gradle | 2 +- .../mogo/eagle/core/data/config/FunctionBuildConfig.kt | 6 +++--- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git 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 index 197161ba04..b3470d6fe0 100644 --- 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; } diff --git 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 index e64673e21e..bb654fde0b 100644 --- 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