Merge branch 'refs/heads/dev_robotaxi-d_240715_6.4.4_pnc_park' into dev_robotaxi-d_240729_6.6.0
# Conflicts: # OCH/common/biz/src/main/java/com/mogo/och/biz/login/model/LoginModel.kt # OCH/facade/src/main/java/com/mogo/och/facade/route/FacadeProvider.kt # core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt # gradle.properties # libraries/mogo-adas-data/src/main/proto/message_pad.proto # libraries/mogo-adas-data/src/main/proto/personal/adas_constants.proto # settings.gradle
This commit is contained in:
@@ -79,6 +79,13 @@ abstract class FacadeProvider : IMoGoFunctionProvider, ILoginCallback {
|
||||
}
|
||||
|
||||
private fun getFragment(): Fragment {
|
||||
if(FunctionBuildConfig.isOffLine){
|
||||
if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
|
||||
return getFragmentByServeName(OchCommonConst.OFFLINE_DRIVER)
|
||||
}else if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
|
||||
return getFragmentByServeName(OchCommonConst.OFFLINE_PASSENGER)
|
||||
}
|
||||
}
|
||||
if(DeviceUtils.isEB5Model()&&AppIdentityModeUtils.isCharterPassenger(FunctionBuildConfig.appIdentityMode)){
|
||||
val maxVolume = VolumeUtils.getMaxVolume(AudioManager.STREAM_MUSIC)
|
||||
val volume = VolumeUtils.getVolume(AudioManager.STREAM_MUSIC)
|
||||
|
||||
Reference in New Issue
Block a user