yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[v2.5.4]OCH: 司机/乘客-Taxi/Bus身份区分逻辑优化

Browse Source
This commit is contained in:
pangfan
2022-02-28 16:31:27 +08:00
parent be8f9b905a
commit 95776f95a8
7 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/MogoOCHTaxiModelNew.java
View File

@@ -24,6 +24,7 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListenerManager;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
@@ -134,7 +135,7 @@ public class MogoOCHTaxiModelNew {
if (NetworkUtils.isConnected(mContext)) {
// startOrStopOrderLoop(mOCHCarStatus == 1);
if (FunctionBuildConfig.appIdentityMode == 0x00) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
queryCarStatus();
}
}
@@ -821,7 +822,7 @@ public class MogoOCHTaxiModelNew {
Logger.d( TAG, "onIntentReceived = %s", intentStr );
if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) {
if ( NetworkUtils.isConnected( mContext ) ) {
if (FunctionBuildConfig.appIdentityMode == 0x00) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
startOrStopOrderLoop(mOCHCarStatus == 1);
queryCarStatus();
}
@@ -941,7 +942,7 @@ public class MogoOCHTaxiModelNew {
mPrevAPStatus = state;
if (FunctionBuildConfig.isDemoMode
&& FunctionBuildConfig.appIdentityMode == 0x01) {
&& AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
// 当美化模式（演示模式）开启时：且是乘客app、且未到终点时，维持自动驾驶icon开启状态
if (!arriveAtEnd) {
return;
@@ -955,7 +956,7 @@ public class MogoOCHTaxiModelNew {
mPrevAPStatus = state;
if (FunctionBuildConfig.isDemoMode
&& FunctionBuildConfig.appIdentityMode == 0x01) {
&& AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
// 当美化模式（演示模式）开启时：且是乘客app、且未到终点时，维持自动驾驶icon开启状态
if (!arriveAtEnd) {
return;
@@ -981,7 +982,7 @@ public class MogoOCHTaxiModelNew {
@Override
public void onAutopilotArriveAtStation(@Nullable AutopilotStationInfo data) {
if (FunctionBuildConfig.isDemoMode
&& FunctionBuildConfig.appIdentityMode == 0x01) {
&& AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
arriveAtEnd = true;
}

5
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/BaseOchTaxiTabFragment.java
View File

@@ -30,6 +30,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager;
import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
import com.mogo.eagle.core.function.call.map.CallerSmpManager;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.map.listener.IMogoMapListener;
import com.mogo.map.uicontroller.VisualAngleMode;
@@ -133,7 +134,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
@Override
public void onClickImpl(View v) {
// 如果能自动驾驶，就自动驾驶，不能就提示
if (FunctionBuildConfig.appIdentityMode == 0x00) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
restartAutopilot();
}
// TODO: 2021/11/27 通过开启结果更新ui
@@ -220,7 +221,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
showNaviToStartStationFragment(false);
});
if (FunctionBuildConfig.appIdentityMode == 0x01) {
if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) {
flStationPanelContainer.setVisibility(View.GONE);
tvOperationStatus.setVisibility(View.GONE);
mSettingBtn.setVisibility(View.GONE);

3
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/OCHTaxiFragment.java
View File

@@ -12,6 +12,7 @@ import androidx.fragment.app.FragmentTransaction;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
import com.mogo.eagle.core.data.config.FunctionBuildConfig;
import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.och.taxi.passenger.R;
@@ -85,7 +86,7 @@ public class OCHTaxiFragment extends BaseOchTaxiTabFragment<OCHTaxiFragment, OCH
switchVRFlatMode(false);
}
if (FunctionBuildConfig.appIdentityMode == 0x00) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
tvOperationStatus.setVisibility(View.VISIBLE);
} else {
tvOperationStatus.setVisibility(View.GONE);

4
app/productFlavors/fPadLenovoOchBus.gradle
View File

@@ -28,8 +28,8 @@ project.android.productFlavors {
// GPS数据提供源： 0-Android系统，1-工控机，2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型，司机｜乘客
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
// 构建的应用身份类型，出租车0|小巴A-司机｜乘客
buildConfigField 'int', 'APP_IDENTITY_MODE', "0xA0"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.102\""
// 构建的是否是演示（美化）模式

4
app/productFlavors/fPadLenovoOchBusPassenger.gradle
View File

@@ -26,8 +26,8 @@ project.android.productFlavors {
// GPS数据提供源： 0-Android系统，1-工控机，2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型，司机0｜乘客1
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x01"
// 构建的应用身份类型，出租车0|小巴A-司机0｜乘客1
buildConfigField 'int', 'APP_IDENTITY_MODE', "0xA1"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.8.103\""
// 构建的是否是演示（美化）模式

2
app/productFlavors/fPadLenovoOchTaxi.gradle
View File

@@ -29,7 +29,7 @@ project.android.productFlavors {
// GPS数据提供源： 0-Android系统，1-工控机，2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型，司机｜乘客
// 构建的应用身份类型，出租车0|小巴A-司机｜乘客
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x00"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.102\""

2
app/productFlavors/fPadLenovoOchTaxiPassenger.gradle
View File

@@ -28,7 +28,7 @@ project.android.productFlavors {
// GPS数据提供源： 0-Android系统，1-工控机，2-OBU
buildConfigField 'int', 'GPS_PROVIDER', "1"
// 构建的应用身份类型，司机0｜乘客1
// 构建的应用身份类型，出租车0|小巴A-司机0｜乘客1
buildConfigField 'int', 'APP_IDENTITY_MODE', "0x01"
// 连接的工控机IP地址
buildConfigField 'String', 'ADAS_CONNECT_IP', "\"192.168.1.103\""