Merge branch 'flutter' into soundmeter

AsCress · web-flow · commit 63293830375c · 2025-06-17T20:37:06.000+05:30
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.3.1" apply false
+    id "com.android.application" version "8.10.1" apply false
     id "org.jetbrains.kotlin.android" version "2.1.21" apply false
 }
 
diff --git a/assets/icons/ic_wifi_connected.png b/assets/icons/ic_wifi_connected.png
diff --git a/assets/icons/icons8_wifi_connected_100.png b/assets/icons/icons8_wifi_connected_100.png
diff --git a/lib/communication/packet_handler.dart b/lib/communication/packet_handler.dart
@@ -3,12 +3,16 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:pslab/communication/commands_proto.dart';
 import 'package:pslab/communication/handler/base.dart';
+import 'package:pslab/communication/socket_client.dart';
 import 'package:pslab/others/logger_service.dart';
+import 'package:pslab/others/science_lab_common.dart';
+import 'package:pslab/providers/locator.dart';
 
 class PacketHandler {
   late Uint8List _buffer;
   late bool _connected;
   late CommunicationHandler _mCommunicationHandler;
+  late SocketClient _socketClient;
   static String version = '';
   late CommandsProto _mCommandsProto;
   int _timeout = 500, versionStringLength = 8;
@@ -18,12 +22,15 @@ class PacketHandler {
     _timeout = timeout;
     _mCommandsProto = CommandsProto();
     _mCommunicationHandler = communicationHandler;
-    _connected = (_mCommunicationHandler.isConnected());
+    _socketClient = getIt.get<SocketClient>();
+    _connected = (getIt.get<ScienceLabCommon>().isWiFiConnected() ||
+        _mCommunicationHandler.isConnected());
     _buffer = Uint8List(10000);
   }
 
   bool isConnected() {
-    _connected = (_mCommunicationHandler.isConnected());
+    _connected = (getIt.get<ScienceLabCommon>().isWiFiConnected() ||
+        _mCommunicationHandler.isConnected());
     return _connected;
   }
 
@@ -145,13 +152,17 @@ class PacketHandler {
     if (_mCommunicationHandler.isConnected()) {
       bytesRead[0] =
           await _mCommunicationHandler.read(_buffer, bytesToRead, _timeout);
+    } else if (getIt.get<ScienceLabCommon>().isWiFiConnected()) {
+      bytesRead[0] = await _socketClient.read(_buffer, bytesToRead, _timeout);
     }
     return bytesRead[0];
   }
 
   void _commonWrite(Uint8List data) {
     if (_mCommunicationHandler.isConnected()) {
       _mCommunicationHandler.write(data, _timeout);
+    } else if (getIt.get<ScienceLabCommon>().isWiFiConnected()) {
+      _socketClient.write(data, _timeout);
     }
   }
 }
diff --git a/lib/communication/science_lab.dart b/lib/communication/science_lab.dart
@@ -3,7 +3,9 @@ import 'package:flutter/foundation.dart';
 import 'package:pslab/communication/commands_proto.dart';
 import 'package:pslab/communication/handler/base.dart';
 import 'package:pslab/communication/packet_handler.dart';
+import 'package:pslab/communication/socket_client.dart';
 import 'package:pslab/others/logger_service.dart';
+import 'package:pslab/providers/locator.dart';
 
 import 'analogChannel/analog_acquisition_channel.dart';
 import 'analogChannel/analog_constants.dart';
@@ -33,12 +35,14 @@ class ScienceLab {
   List<DigitalChannel> dChannels = [];
 
   late CommunicationHandler mCommunicationHandler;
+  late SocketClient mSocketClient;
   late PacketHandler mPacketHandler;
   late CommandsProto mCommandsProto;
   late AnalogConstants mAnalogConstants;
 
   ScienceLab(CommunicationHandler communicationHandler) {
     mCommunicationHandler = communicationHandler;
+    mSocketClient = getIt.get<SocketClient>();
     mCommandsProto = CommandsProto();
     mAnalogConstants = AnalogConstants();
   }
@@ -57,8 +61,20 @@ class ScienceLab {
     }
   }
 
+  Future<void> connectWiFi() async {
+    try {
+      await mSocketClient.openConnection("192.168.4.1", 80);
+      mPacketHandler = PacketHandler(500, mCommunicationHandler);
+    } catch (e) {
+      logger.e(e);
+    }
+    if (isConnected()) {
+      await _initializeVariables();
+    }
+  }
+
   bool isConnected() {
-    return mCommunicationHandler.isConnected();
+    return (mSocketClient.isConnected() || mCommunicationHandler.isConnected());
   }
 
   bool isDeviceFound() {
diff --git a/lib/communication/socket_client.dart b/lib/communication/socket_client.dart
@@ -0,0 +1,63 @@
+import 'dart:io';
+import 'dart:typed_data';
+
+import 'package:pslab/others/logger_service.dart';
+
+class SocketClient {
+  late Socket _socket;
+  late Stream<Uint8List> _socketStream;
+  bool _connected = false;
+  Future<void> openConnection(String host, int port) async {
+    try {
+      _socket = await Socket.connect(host, port);
+      _connected = true;
+      _socket.setOption(SocketOption.tcpNoDelay, true);
+      _socketStream = _socket.asBroadcastStream();
+    } catch (e) {
+      logger.e("Error connecting to socket: $e");
+    }
+  }
+
+  Future<int> read(Uint8List dest, int bytesToRead, int timeoutMillis) async {
+    int numBytesRead = 0;
+    int bytesToBeReadTemp = bytesToRead;
+
+    try {
+      await for (Uint8List receivedData
+          in _socketStream.timeout(Duration(milliseconds: timeoutMillis))) {
+        int readNow = receivedData.length;
+
+        if (readNow == 0) {
+          logger.e("Read Error: $bytesToBeReadTemp");
+          return numBytesRead;
+        } else {
+          int readLength = readNow.clamp(0, bytesToBeReadTemp);
+          dest.setRange(numBytesRead, numBytesRead + readLength, receivedData);
+          numBytesRead += readLength;
+          bytesToBeReadTemp -= readLength;
+        }
+
+        if (numBytesRead >= bytesToRead) {
+          break;
+        }
+      }
+    } catch (e) {
+      logger.e("Exception during read: $e");
+    }
+
+    logger.d("Bytes Read: $numBytesRead");
+    return numBytesRead;
+  }
+
+  void write(Uint8List src, int timeoutMillis) {
+    _socket.add(src);
+  }
+
+  bool isConnected() {
+    return _connected;
+  }
+
+  void setConnected(bool connected) {
+    _connected = connected;
+  }
+}
diff --git a/lib/others/science_lab_common.dart b/lib/others/science_lab_common.dart
@@ -1,14 +1,17 @@
 import 'package:pslab/communication/handler/base.dart';
 import 'package:pslab/communication/science_lab.dart';
+import 'package:pslab/communication/socket_client.dart';
 import 'package:pslab/others/logger_service.dart';
 
 class ScienceLabCommon {
   static late ScienceLab _scienceLab;
   static late CommunicationHandler communicationHandler;
+  static late SocketClient _socketClient;
 
   ScienceLabCommon(CommunicationHandler mCommunicationHandler) {
     communicationHandler = mCommunicationHandler;
     _scienceLab = ScienceLab(communicationHandler);
+    _socketClient = _scienceLab.mSocketClient;
   }
 
   ScienceLab getScienceLab() {
@@ -28,6 +31,11 @@ class ScienceLabCommon {
     return communicationHandler.initialize();
   }
 
+  Future<bool> openWiFiDevice() async {
+    await _scienceLab.connectWiFi();
+    return _socketClient.isConnected();
+  }
+
   void setConnected(bool connected) {
     communicationHandler.connected = connected;
   }
@@ -39,4 +47,12 @@ class ScienceLabCommon {
   bool isDeviceFound() {
     return communicationHandler.isDeviceFound();
   }
+
+  bool isWiFiConnected() {
+    return _socketClient.isConnected();
+  }
+
+  void setWiFiConnected(bool connected) {
+    _socketClient.setConnected(connected);
+  }
 }
diff --git a/lib/providers/board_state_provider.dart b/lib/providers/board_state_provider.dart
@@ -1,3 +1,4 @@
+import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:pslab/communication/science_lab.dart';
 import 'package:pslab/constants.dart';
@@ -32,14 +33,33 @@ class BoardStateProvider extends ChangeNotifier {
               pslabIsConnected = await scienceLabCommon.openDevice();
               setPSLabVersionIDs();
             }
-          } else if (usbEvent.event == UsbEvent.ACTION_USB_DETACHED) {
+          } else if (usbEvent.event == UsbEvent.ACTION_USB_DETACHED &&
+              !scienceLabCommon.isWiFiConnected()) {
             scienceLabCommon.setConnected(false);
             pslabIsConnected = false;
             pslabVersionID = 'Not Connected';
             notifyListeners();
           }
         },
       );
+
+      Connectivity()
+          .onConnectivityChanged
+          .listen((List<ConnectivityResult> results) {
+        if (results.contains(ConnectivityResult.none)) {
+          scienceLabCommon.setWiFiConnected(false);
+          pslabIsConnected = false;
+          pslabVersionID = 'Not Connected';
+          notifyListeners();
+        }
+      });
+    }
+  }
+
+  Future<void> initializeWiFi() async {
+    if (!pslabIsConnected) {
+      pslabIsConnected = await scienceLabCommon.openWiFiDevice();
+      setPSLabVersionIDs();
     }
   }
 
diff --git a/lib/providers/locator.dart b/lib/providers/locator.dart
@@ -5,6 +5,7 @@ import 'package:pslab/communication/handler/android_comms_handler.dart';
 import 'package:pslab/communication/handler/base.dart';
 import 'package:pslab/communication/handler/ios_comms_handler.dart';
 import 'package:pslab/communication/science_lab.dart';
+import 'package:pslab/communication/socket_client.dart';
 import 'package:pslab/others/science_lab_common.dart';
 import 'package:pslab/providers/board_state_provider.dart';
 
@@ -18,6 +19,7 @@ void setupLocator() {
       return IosNoOpCommunicationHandler();
     }
   });
+  getIt.registerLazySingleton<SocketClient>(() => SocketClient());
   getIt.registerLazySingleton<ScienceLabCommon>(
       () => ScienceLabCommon(getIt.get<CommunicationHandler>()));
   getIt.registerLazySingleton<ScienceLab>(
diff --git a/lib/view/connect_device_screen.dart b/lib/view/connect_device_screen.dart
@@ -10,6 +10,7 @@ class ConnectDeviceScreen extends StatefulWidget {
   final String iconUsbDisconnected =
       'assets/icons/icons_usb_disconnected_100.png';
   final String iconUsbConnected = 'assets/icons/icons8_usb_connected_100.png';
+  final String iconWifiConnected = 'assets/icons/icons8_wifi_connected_100.png';
 
   @override
   State<StatefulWidget> createState() => _HomeScreenState();
@@ -35,7 +36,9 @@ class _HomeScreenState extends State<ConnectDeviceScreen> {
                     Center(
                       child: Image.asset(
                         provider.pslabIsConnected
-                            ? widget.iconUsbConnected
+                            ? (provider.scienceLabCommon.isWiFiConnected()
+                                ? widget.iconWifiConnected
+                                : widget.iconUsbConnected)
                             : widget.iconUsbDisconnected,
                         width: 80,
                         height: 80,
@@ -145,7 +148,9 @@ class _HomeScreenState extends State<ConnectDeviceScreen> {
                                 backgroundColor: const Color(0xFFD32F2F),
                                 foregroundColor: Colors.white,
                               ),
-                              onPressed: () {},
+                              onPressed: () async {
+                                await provider.initializeWiFi();
+                              },
                               child: Padding(
                                 padding: const EdgeInsets.all(10),
                                 child: Text(
diff --git a/lib/view/widgets/main_scaffold_widget.dart b/lib/view/widgets/main_scaffold_widget.dart
@@ -13,6 +13,7 @@ class MainScaffold extends StatefulWidget {
   final List<Widget>? actions;
   final String icUsbDisconnected = 'assets/icons/ic_usb_disconnected.png';
   final String icUsbConnected = 'assets/icons/ic_usb_connected.png';
+  final String icWiFiConnected = 'assets/icons/ic_wifi_connected.png';
 
   const MainScaffold(
       {super.key,
@@ -61,7 +62,9 @@ class _MainScaffoldState extends State<MainScaffold> {
               return IconButton(
                 icon: Image.asset(
                   provider.pslabIsConnected
-                      ? widget.icUsbConnected
+                      ? (provider.scienceLabCommon.isWiFiConnected()
+                          ? widget.icWiFiConnected
+                          : widget.icUsbConnected)
                       : widget.icUsbDisconnected,
                   width: 24,
                   height: 24,
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ pluginManagement {`
`18`	`18`
`19`	`19`	`plugins {`
`20`	`20`	`id "dev.flutter.flutter-plugin-loader" version "1.0.0"`
`21`		`- id "com.android.application" version "8.3.1" apply false`
	`21`	`+ id "com.android.application" version "8.10.1" apply false`
`22`	`22`	`id "org.jetbrains.kotlin.android" version "2.1.21" apply false`
`23`	`23`	`}`
`24`	`24`