Merge pull request #38 from jcardus/wuizi-m

main

Author: jcardus

lib/models/position.dart

@@ -47,7 +47,7 @@ class Position {
       course: (json['course'] as num?)?.toDouble() ?? 0.0,
       address: json['address'] as String?,
       accuracy: (json['accuracy'] as num?)?.toDouble(),
-      batteryLevel: json['attributes']?['batteryLevel'] as int?,
+      batteryLevel: (json['attributes']?['batteryLevel'] as num?)?.toInt(),
       attributes: json['attributes'] as Map<String, dynamic>?,
     );
   }

lib/services/socket_service.dart

@@ -26,11 +26,13 @@ class SocketService {
   Future<bool> connect() async {
     if (_disposed || kIsWeb) return false;
 
-    final base = traccarBaseUrl;
-    if (base.isEmpty) return false;
-
-    final wsScheme = base.startsWith('https') ? 'wss' : 'ws';
-    final wsUrl = '${base.replaceFirst(RegExp('^https?'), wsScheme)}/api/socket';
+    var wsUrl = String.fromEnvironment('WEBSOCKET_URL');
+    if (wsUrl.isEmpty) {
+      final base = traccarBaseUrl;
+      if (base.isEmpty) return false;
+      final wsScheme = base.startsWith('https') ? 'wss' : 'ws';
+      wsUrl = '${base.replaceFirst(RegExp('^https?'), wsScheme)}/api/socket';
+    }
 
     try {
       final cookie = await AuthService().getCookie();

pubspec.yaml

@@ -2,7 +2,7 @@ name: manager
 description: "Wuizy"
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 3.3.8+1
+version: 3.3.12+1
 
 environment:
   sdk: ^3.9.2