fix: driving mode, mock backend url, message header attributes

SchweizerischeBundesbahnen · Oct 24, 2024 · a977808 · a977808
1 parent c98edc0
commit a977808
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/das_client/lib/flavor.dart b/das_client/lib/flavor.dart
@@ -6,21 +6,21 @@ enum Flavor {
   dev(
     displayName: 'Dev',
     //backendUrl: 'http://localhost:8080',
-    backendUrl: 'https://das-backend-dev.app.sbb.ch',
+    backendUrl: 'https://sfera-mock.app.sbb.ch',
     mqttUrl: 'wss://das-poc.messaging.solace.cloud',
     authenticatorConfig: _authenticatorConfigDev,
   ),
   inte(
     displayName: 'Inte',
     //backendUrl: 'http://localhost:8080',
-    backendUrl: 'https://das-backend-dev.app.sbb.ch',
+    backendUrl: 'https://sfera-mock.app.sbb.ch',
     mqttUrl: 'wss://das-poc.messaging.solace.cloud',
     authenticatorConfig: _authenticatorConfigInte,
   ),
   prod(
     displayName: 'Prod',
     //backendUrl: 'http://localhost:8080',
-    backendUrl: 'https://das-backend-dev.app.sbb.ch',
+    backendUrl: 'https://sfera-mock.app.sbb.ch',
     mqttUrl: 'wss://das-poc.messaging.solace.cloud',
     authenticatorConfig: _authenticatorConfigProd,
   );

diff --git a/das_client/lib/pages/fahrt/widgets/train_selection.dart b/das_client/lib/pages/fahrt/widgets/train_selection.dart
@@ -19,8 +19,8 @@ class _TrainSelectionState extends State<TrainSelection> {
   @override
   void initState() {
     super.initState();
-    _trainNumberController = TextEditingController(text: "9232");
-    _companyController = TextEditingController(text: "1088");
+    _trainNumberController = TextEditingController(text: "4816");
+    _companyController = TextEditingController(text: "1085");
 
     context.fahrbildCubit.updateTrainNumber(_trainNumberController.text);
     context.fahrbildCubit.updateCompany(_companyController.text);

diff --git a/das_client/lib/service/sfera/sfera_service.dart b/das_client/lib/service/sfera/sfera_service.dart
@@ -149,9 +149,15 @@ class SferaService {
     _stateSubject.add(SferaServiceState.disconnected);
   }
 
-  static Future<MessageHeader> messageHeader({TrainIdentification? trainIdentification}) async {
-    return MessageHeader.create(const Uuid().v4(), Format.sferaTimestamp(DateTime.now()),
-        await DeviceIdInfo.getDeviceId(), "TMS", await DeviceIdInfo.getDeviceId(), "TMS",
+  static Future<MessageHeader> messageHeader(
+      {TrainIdentification? trainIdentification}) async {
+    return MessageHeader.create(
+        const Uuid().v4(),
+        Format.sferaTimestamp(DateTime.now()),
+        await DeviceIdInfo.getDeviceId(),
+        "TMS",
+        "1085",
+        "0085",
         trainIdentification: trainIdentification);
   }
 

diff --git a/das_client/lib/service/sfera/task/handshake_task.dart b/das_client/lib/service/sfera/task/handshake_task.dart
@@ -38,8 +38,8 @@ class HandshakeTask extends SferaTask {
     Fimber.i("Sending handshake request for company=${otnId.company} train=$sferaTrain");
     var handshakeRequest = HandshakeRequest.create([
       DasOperatingModesSupported.create(
-          DasDrivingMode.goa1, DasArchitecture.boardAdviceCalculation, DasConnectivity.connected),
-    ], relatedTrainRequestType: RelatedTrainRequestType.ownTrainAndRelatedTrains, statusReportsEnabled: true);
+          DasDrivingMode.readOnly, DasArchitecture.boardAdviceCalculation, DasConnectivity.connected),
+    ], relatedTrainRequestType: RelatedTrainRequestType.ownTrainAndRelatedTrains, statusReportsEnabled: false);
 
     var sferaB2gRequestMessage =
         SferaB2gRequestMessage.create(await SferaService.messageHeader(), handshakeRequest: handshakeRequest);

diff --git a/das_client/lib/util/format.dart b/das_client/lib/util/format.dart
@@ -11,7 +11,7 @@ class Format {
 
   static String sferaTimestamp(DateTime date) {
     final localDate = date.toLocal();
-    final dateFormat = DateFormat("yyyy-MM-ddTHH:mm:ssZ");
+    final dateFormat = DateFormat("yyyy-MM-ddTHH:mm:ss'Z'");
     return dateFormat.format(localDate);
   }