From f753aef23bf7bfe0d39e08435e3286d8622b5f2f Mon Sep 17 00:00:00 2001 From: Sven Carstensen Date: Wed, 6 Mar 2024 15:38:32 +0100 Subject: [PATCH] Bootstrap wieder eingebaut --- lib/tools/mqtt_core.dart | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/tools/mqtt_core.dart b/lib/tools/mqtt_core.dart index e66b10d..7f40931 100644 --- a/lib/tools/mqtt_core.dart +++ b/lib/tools/mqtt_core.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'dart:convert'; import 'dart:math'; +import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:isar/isar.dart'; import 'package:mqtt_client/mqtt_client.dart'; @@ -330,25 +331,31 @@ class MqttCore { void _processBootstrap() async { try { - var deviceObject = DeviceObject(); - deviceObject.manufacturer = "sven"; - deviceObject.model = "emulator"; - deviceObject.os = "hat es"; - deviceObject.osVer = "0.0"; + String? responseText = ""; - var handshakeMessage = BootstrapRequest(); - handshakeMessage.app = "sb"; - handshakeMessage.mqttClientId = await Util.getAppUuid(); - handshakeMessage.deviceObject = deviceObject; - handshakeMessage.ver = 200; + if (!kDebugMode) { + var deviceObject = DeviceObject(); + deviceObject.manufacturer = "sven"; + deviceObject.model = "emulator"; + deviceObject.os = "hat es"; + deviceObject.osVer = "0.0"; - var jsonMap = handshakeMessage.toJson(); - var json = jsonEncode(jsonMap); - var uri = "http://test-app-server.dns.army:8080/bootstrap"; - Util.logInfo("Bootstrap request: $uri"); + var handshakeMessage = BootstrapRequest(); + handshakeMessage.app = "sb"; + handshakeMessage.mqttClientId = await Util.getAppUuid(); + handshakeMessage.deviceObject = deviceObject; + handshakeMessage.ver = 200; - var response = await http.get(Uri.parse(uri)); - var responseText = response.body; + var jsonMap = handshakeMessage.toJson(); + var json = jsonEncode(jsonMap); + var uri = "http://test-app-server.dns.army:8080/bootstrap"; + Util.logInfo("Bootstrap request: $uri"); + + var response = await http.get(Uri.parse(uri)); + responseText = response.body; + } else { + responseText = await rootBundle.loadString('assets/json/bootstrap_response.json'); + } Util.logInfo("Bootstrap response: $responseText");