diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java index b055197895..88b3cfad93 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/OchBusPresenter.java @@ -255,7 +255,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog lat = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLat(); lon = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getLastLon(); - OchBusResetRequest request = new OchBusResetRequest(Utils.getSn(), 1, lat, lon); + OchBusResetRequest request = new OchBusResetRequest(MoGoAiCloudClientConfig.getInstance().getSn(), 1, lat, lon); RequestBody requestBody = RequestBody.create(MediaType.get("application/json;charset=UTF-8"), GsonUtil.jsonFromObject(request)); mService.debugResetStationStatus(requestBody) .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) @@ -328,7 +328,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog } isGoingToNextStation = true; AIAssist.getInstance( getContext() ).speakTTSVoice( "欢迎乘坐’蘑菇车联‘无人驾驶小巴车,请您坐好,注意乘车安全,行程即将开始" ); - RequestBody request = RequestBody.create( MediaType.get( "application/json" ), GsonUtil.jsonFromObject( new OchBusLeaveStationRequest( Utils.getSn(), stationList.get( currentStationIndex ).getSiteId() ) ) ); + RequestBody request = RequestBody.create( MediaType.get( "application/json" ), GsonUtil.jsonFromObject( new OchBusLeaveStationRequest( MoGoAiCloudClientConfig.getInstance().getSn(), stationList.get( currentStationIndex ).getSiteId() ) ) ); mService.leaveStation( request ).subscribeOn( Schedulers.io() ) .observeOn( AndroidSchedulers.mainThread() ) .subscribe( new SubscribeImpl< OchBusRoutesResponse >( RequestOptions.create( getContext() ) ) { @@ -486,7 +486,7 @@ public class OchBusPresenter extends Presenter< OchBusFragment > implements IMog Logger.d( TAG, "单程结束====" ); MogoApisHandler.getInstance().getApis().getAdasControllerApi().cancelAutopilot(); AIAssist.getInstance( getContext() ).speakTTSVoice( "感谢您体验’蘑菇车联‘无人驾驶小巴车,请您携带好随身物品,我们下次再见" ); - RequestBody request = RequestBody.create( MediaType.get( "application/json" ), GsonUtil.jsonFromObject( new OchBusLeaveStationRequest( Utils.getSn(), stationList.get( currentStationIndex ).getSiteId() ) ) ); + RequestBody request = RequestBody.create( MediaType.get( "application/json" ), GsonUtil.jsonFromObject( new OchBusLeaveStationRequest( MoGoAiCloudClientConfig.getInstance().getSn(), stationList.get( currentStationIndex ).getSiteId() ) ) ); mService.leaveStation( request ).subscribeOn( Schedulers.io() ) .observeOn( AndroidSchedulers.mainThread() ) .subscribe( new SubscribeImpl< OchBusRoutesResponse >( RequestOptions.create( getContext() ) ) { diff --git a/app/productFlavors/bydauto.gradle b/app/productFlavors/bydauto.gradle index f4428d6ed9..d0b1dc91e3 100644 --- a/app/productFlavors/bydauto.gradle +++ b/app/productFlavors/bydauto.gradle @@ -31,5 +31,7 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' + // GPS数据提供源: 0-Android系统,1-工控机,2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" } } \ No newline at end of file diff --git a/app/productFlavors/f80x.gradle b/app/productFlavors/f80x.gradle index ddde742e76..f970b4cfd1 100644 --- a/app/productFlavors/f80x.gradle +++ b/app/productFlavors/f80x.gradle @@ -31,6 +31,8 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' + // GPS数据提供源: 0-Android系统,1-工控机,2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" } } \ No newline at end of file diff --git a/app/productFlavors/f8Amap.gradle b/app/productFlavors/f8Amap.gradle index 2c3fc9acc7..e9a741fb95 100644 --- a/app/productFlavors/f8Amap.gradle +++ b/app/productFlavors/f8Amap.gradle @@ -31,6 +31,8 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'false' // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' + // GPS数据提供源: 0-Android系统,1-工控机,2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" } } \ No newline at end of file diff --git a/app/productFlavors/f8xx.gradle b/app/productFlavors/f8xx.gradle index d8b9d7527b..1c98760fbb 100644 --- a/app/productFlavors/f8xx.gradle +++ b/app/productFlavors/f8xx.gradle @@ -31,6 +31,8 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' + // GPS数据提供源: 0-Android系统,1-工控机,2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" } } \ No newline at end of file diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index c54f50ff67..9f09cb6836 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -31,5 +31,7 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' + // GPS数据提供源: 0-Android系统,1-工控机,2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" } } \ No newline at end of file diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle index aa182ce810..a3e72e5219 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fPadLenovoOchTaxi.gradle @@ -34,6 +34,8 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' + // GPS数据提供源: 0-Android系统,1-工控机,2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" } } \ No newline at end of file diff --git a/app/productFlavors/fochbus.gradle b/app/productFlavors/fochbus.gradle index 4c9f88111e..649d31a26b 100644 --- a/app/productFlavors/fochbus.gradle +++ b/app/productFlavors/fochbus.gradle @@ -31,6 +31,8 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' + // GPS数据提供源: 0-Android系统,1-工控机,2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" } } \ No newline at end of file diff --git a/app/productFlavors/fochtaxi.gradle b/app/productFlavors/fochtaxi.gradle index 473b8bc9a3..30f5349135 100644 --- a/app/productFlavors/fochtaxi.gradle +++ b/app/productFlavors/fochtaxi.gradle @@ -31,6 +31,8 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' + // GPS数据提供源: 0-Android系统,1-工控机,2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" } } \ No newline at end of file diff --git a/app/productFlavors/phone.gradle b/app/productFlavors/phone.gradle index 019c636a36..7694872acc 100644 --- a/app/productFlavors/phone.gradle +++ b/app/productFlavors/phone.gradle @@ -29,5 +29,7 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_USE_ADAS_RTK_LOCATION_INFO', 'true' // 是否需要悬浮窗权限申请 buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true' + // GPS数据提供源: 0-Android系统,1-工控机,2-OBU + buildConfigField 'int', 'GPS_PROVIDER', "1" } } \ No newline at end of file