Merge pull request #723 from CyBear-Jinni/dev

Dev

.github/workflows/dart.yml

@@ -9,7 +9,7 @@ on:
 
 env:
   flutter_channel: 'stable' # or: 'dev' or 'beta'
-  flutter_version: '3.13.6'
+  flutter_version: '3.16.5'
 
 jobs:
   build:

lib/domain/connections_service.dart

@@ -1,12 +1,28 @@
 import 'dart:async';
 import 'dart:collection';
+import 'dart:convert';
+import 'dart:io';
 
 import 'package:cbj_integrations_controller/integrations_controller.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
+import 'package:cybearjinni/infrastructure/core/injection.dart';
+import 'package:cybearjinni/infrastructure/core/logger.dart';
 import 'package:cybearjinni/infrastructure/network_utilities_flutter.dart';
+import 'package:dartz/dartz.dart';
+import 'package:flutter/foundation.dart';
+import 'package:grpc/grpc.dart';
+import 'package:location/location.dart';
+import 'package:network_info_plus/network_info_plus.dart';
+import 'package:network_tools_flutter/network_tools_flutter.dart';
+import 'package:permission_handler/permission_handler.dart'
+    as permission_handler;
+import 'package:rxdart/rxdart.dart';
 
 part 'package:cybearjinni/infrastructure/connection_service/app_connection_service.dart';
+part 'package:cybearjinni/infrastructure/connection_service/hub_connection_service.dart';
 part 'package:cybearjinni/infrastructure/connection_service/demo_connection_service.dart';
 part 'package:cybearjinni/infrastructure/connection_service/none_connection_service.dart';
+part 'package:cybearjinni/infrastructure/connection_service/remote_pipes_connection_service.dart';
 
 enum ConnectionType {
   appAsHub,
@@ -26,39 +42,41 @@ abstract interface class ConnectionsService {
 
   static ConnectionType _currentConnectionType = ConnectionType.appAsHub;
 
-  static void setCurrentConnectionType(ConnectionType? connectionType) {
+  static void setCurrentConnectionType(ConnectionType connectionType) {
     if (connectionType == _currentConnectionType) {
       return;
     }
-    final ConnectionsService? oldInstance = _instance;
+    _instance?.dispose();
+
+    _currentConnectionType = connectionType;
+
     switch (connectionType) {
       case ConnectionType.appAsHub:
         _instance = _AppConnectionService();
-        _currentConnectionType = ConnectionType.appAsHub;
-      case ConnectionType.demo:
       case ConnectionType.hub:
+        _instance = _HubConnectionService();
       case ConnectionType.remotePipes:
+        _instance = _RemotePipesConnectionService();
+      case ConnectionType.demo:
         _instance = _DemoConnectionService();
-        _currentConnectionType = ConnectionType.demo;
       case ConnectionType.none:
-      case null:
         _instance = _NoneConnectionService();
-        _currentConnectionType = ConnectionType.none;
     }
-    oldInstance?.dispose();
   }
 
   static ConnectionType getCurrentConnectionType() => _currentConnectionType;
 
+  Future<bool> connect({String? address});
+
   Future searchDevices();
 
-  void setEntityState(ActionObject action);
+  void setEntityState(RequestActionObject action);
 
   Future setEtitiesToArea(String areaId, HashSet<String> entities);
 
-  Future<HashMap<String, DeviceEntityBase>> get getAllEntities;
+  Future<HashMap<String, DeviceEntityBase>> get getEntities;
 
-  Future<HashMap<String, AreaEntity>> get getAllAreas;
+  Future<HashMap<String, AreaEntity>> get getAreas;
 
   Stream<MapEntry<String, DeviceEntityBase>> watchEntities();
 
@@ -68,9 +86,13 @@ abstract interface class ConnectionsService {
 
   Future setNewArea(AreaEntity area);
 
-  Future<HashMap<String, SceneCbjEntity>> getScenes();
+  Future<HashMap<String, SceneCbjEntity>> get getScenes;
 
   Future activateScene(String id);
 
   Future addScene(SceneCbjEntity scene);
+
+  Future loginVendor(VendorLoginEntity value);
+
+  Future<List<VendorEntityInformation>> getVendors();
 }