commit branches simulator windows web differences implementation
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
import 'dart:convert';
|
||||
import 'dart:io';
|
||||
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get_storage/get_storage.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import '../models/response_output.dart';
|
||||
import 'package:device_info_plus/device_info_plus.dart';
|
||||
|
||||
import '../models/response_output.dart';
|
||||
import '../helper/constants.dart';
|
||||
|
||||
enum MainView { dashboard, traun, sarleinsbach, lannach, settings }
|
||||
@@ -94,6 +96,18 @@ class HomeController extends GetxController {
|
||||
},
|
||||
};
|
||||
|
||||
//Device Info data
|
||||
Future<bool> isAndroidSimulator() async {
|
||||
// Prüfen, ob es überhaupt Android ist
|
||||
if (!Platform.isAndroid) return false;
|
||||
|
||||
final deviceInfo = DeviceInfoPlugin();
|
||||
final androidInfo = await deviceInfo.androidInfo;
|
||||
|
||||
// Wenn es KEIN physisches Gerät ist, ist es ein Simulator/Emulator
|
||||
return !androidInfo.isPhysicalDevice;
|
||||
}
|
||||
|
||||
void fetchData() async {
|
||||
final inputFromIso = dateFromToIsoController.value.text;
|
||||
final inputToIso = dateToIsoController.value.text;
|
||||
@@ -104,7 +118,7 @@ class HomeController extends GetxController {
|
||||
return;
|
||||
}
|
||||
|
||||
final baseUrl = _getBaseUrl();
|
||||
final baseUrl = getBaseUrl;
|
||||
if (baseUrl.isEmpty) {
|
||||
kDisplaySnackBarRed('Bitte zuerst die Server-URL eintragen.');
|
||||
return;
|
||||
@@ -123,12 +137,24 @@ class HomeController extends GetxController {
|
||||
|
||||
try {
|
||||
// Fetch PV Daten
|
||||
await _fetchAndStore(baseUri, inputFromIso, inputToIso,
|
||||
config['pvSuffix'], config['pv'], basicAuth);
|
||||
await _fetchAndStore(
|
||||
baseUri,
|
||||
inputFromIso,
|
||||
inputToIso,
|
||||
config['pvSuffix'],
|
||||
config['pv'],
|
||||
basicAuth,
|
||||
);
|
||||
|
||||
// Fetch Import Daten
|
||||
await _fetchAndStore(baseUri, inputFromIso, inputToIso,
|
||||
config['importSuffix'], config['import'], basicAuth);
|
||||
await _fetchAndStore(
|
||||
baseUri,
|
||||
inputFromIso,
|
||||
inputToIso,
|
||||
config['importSuffix'],
|
||||
config['import'],
|
||||
basicAuth,
|
||||
);
|
||||
} catch (e) {
|
||||
print('Error: $e');
|
||||
kDisplaySnackBarRed('Netzwerkfehler: $e');
|
||||
@@ -163,7 +189,9 @@ class HomeController extends GetxController {
|
||||
|
||||
if (statusGroup == 2) {
|
||||
print('✓ $switchBranch erfolgreich geladen');
|
||||
responseObservable.value = ResponseOutput.fromJson(jsonDecode(response.body));
|
||||
responseObservable.value = ResponseOutput.fromJson(
|
||||
jsonDecode(response.body),
|
||||
);
|
||||
} else if (statusGroup == 4) {
|
||||
kDisplaySnackBarRed('Fehler 4xx: ${response.statusCode}');
|
||||
} else if (statusGroup == 5) {
|
||||
@@ -177,21 +205,38 @@ class HomeController extends GetxController {
|
||||
}
|
||||
}
|
||||
|
||||
/// Wählt die richtige Base-URL:
|
||||
/// Web: localhost:3000 (Reverse Proxy)
|
||||
/// Desktop: Direkt von Settings
|
||||
String _getBaseUrl() {
|
||||
final settingsUrl = powerUrlController.value.text.trim();
|
||||
|
||||
// Auf Web: verwende Reverse Proxy auf localhost:3000
|
||||
final isEmulator = false.obs;
|
||||
|
||||
// Synchroner Getter
|
||||
String get getBaseUrl {
|
||||
if (kIsWeb) {
|
||||
return 'http://localhost:3000/invoke/IFN_ASKI_Service.flows/getAskiData?';
|
||||
}
|
||||
|
||||
// Auf Desktop (Windows, Linux, macOS): direkt von Settings
|
||||
return settingsUrl;
|
||||
if (isEmulator.value) {
|
||||
return 'http://10.12.101.27:5556/invoke/IFN_ASKI_Service.flows/getAskiData?';
|
||||
}
|
||||
return powerUrlController.value.text.trim();
|
||||
}
|
||||
|
||||
|
||||
/// Wählt die richtige Base-URL:
|
||||
/// Web: localhost:3000 (Reverse Proxy)
|
||||
/// Desktop: Direkt von Settings
|
||||
// Future<String> _getBaseUrl() async {
|
||||
// final settingsUrl = powerUrlController.value.text.trim();
|
||||
|
||||
// // Auf Web: verwende Reverse Proxy auf localhost:3000
|
||||
// if (kIsWeb) {
|
||||
// return 'http://localhost:3000/invoke/IFN_ASKI_Service.flows/getAskiData?';
|
||||
// }
|
||||
// if (await isAndroidSimulator()) {
|
||||
// return 'http://10.12.101.27:5556/invoke/IFN_ASKI_Service.flows/getAskiData?';
|
||||
// }
|
||||
|
||||
// // Auf Desktop (Windows, Linux, macOS): direkt von Settings
|
||||
// return settingsUrl;
|
||||
// }
|
||||
|
||||
void changeView(MainView view) {
|
||||
currentView.value = view;
|
||||
if (currentView.value == MainView.dashboard) {
|
||||
@@ -225,8 +270,13 @@ class HomeController extends GetxController {
|
||||
}
|
||||
|
||||
@override
|
||||
void onInit() {
|
||||
void onInit() async {
|
||||
super.onInit();
|
||||
if (!kIsWeb && Platform.isAndroid) {
|
||||
final deviceInfo = DeviceInfoPlugin();
|
||||
final androidInfo = await deviceInfo.androidInfo;
|
||||
isEmulator(!androidInfo.isPhysicalDevice);
|
||||
}
|
||||
_readStorageData();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user