client refactor

oldrev · oldrev · commit 4abbbe53c4fa · 2025-05-30T23:15:20.000+08:00
diff --git a/client/lib/devices/borneo/lyfi/view_models/acclimation_view_model.dart b/client/lib/devices/borneo/lyfi/view_models/acclimation_view_model.dart
@@ -1,6 +1,6 @@
 import 'package:borneo_app/devices/borneo/lyfi/view_models/base_lyfi_device_view_model.dart';
 import 'package:borneo_common/io/net/rssi.dart';
-import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 
 class AcclimationViewModel extends BaseLyfiDeviceViewModel {
   late final AcclimationSettings _origSettings;
diff --git a/client/lib/devices/borneo/lyfi/view_models/base_lyfi_device_view_model.dart b/client/lib/devices/borneo/lyfi/view_models/base_lyfi_device_view_model.dart
@@ -1,4 +1,5 @@
 import 'package:borneo_app/devices/borneo/view_models/base_borneo_device_view_model.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/api.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
 
 abstract class BaseLyfiDeviceViewModel extends BaseBorneoDeviceViewModel {
diff --git a/client/lib/devices/borneo/lyfi/view_models/easy_setup_view_model.dart b/client/lib/devices/borneo/lyfi/view_models/easy_setup_view_model.dart
@@ -1,3 +1,4 @@
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:flutter/foundation.dart';
 
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
diff --git a/client/lib/devices/borneo/lyfi/view_models/editor/base_editor_view_model.dart b/client/lib/devices/borneo/lyfi/view_models/editor/base_editor_view_model.dart
@@ -2,7 +2,9 @@ import 'package:borneo_app/devices/borneo/lyfi/view_models/constants.dart';
 import 'package:borneo_app/devices/borneo/lyfi/view_models/editor/ieditor.dart';
 import 'package:borneo_app/devices/borneo/lyfi/view_models/lyfi_view_model.dart';
 import 'package:borneo_common/async/async_rate_limiter.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/api.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:flutter/material.dart';
 
 abstract class BaseEditorViewModel extends ChangeNotifier implements IEditor {
diff --git a/client/lib/devices/borneo/lyfi/view_models/editor/ieditor.dart b/client/lib/devices/borneo/lyfi/view_models/editor/ieditor.dart
@@ -1,4 +1,5 @@
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:flutter/foundation.dart';
 
 abstract class IEditor extends ChangeNotifier {
diff --git a/client/lib/devices/borneo/lyfi/view_models/editor/manual_editor_view_model.dart b/client/lib/devices/borneo/lyfi/view_models/editor/manual_editor_view_model.dart
@@ -1,5 +1,6 @@
 import 'package:borneo_app/devices/borneo/lyfi/view_models/editor/base_editor_view_model.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 
 class ManualEditorViewModel extends BaseEditorViewModel {
   @override
diff --git a/client/lib/devices/borneo/lyfi/view_models/editor/schedule_editor_view_model.dart b/client/lib/devices/borneo/lyfi/view_models/editor/schedule_editor_view_model.dart
@@ -1,5 +1,7 @@
 import 'package:borneo_app/devices/borneo/lyfi/view_models/editor/base_editor_view_model.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/api.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
diff --git a/client/lib/devices/borneo/lyfi/view_models/editor/sun_editor_view_model.dart b/client/lib/devices/borneo/lyfi/view_models/editor/sun_editor_view_model.dart
@@ -1,5 +1,7 @@
 import 'package:borneo_app/devices/borneo/lyfi/view_models/editor/base_editor_view_model.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/api.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 
 class SunEditorViewModel extends BaseEditorViewModel {
   ILyfiDeviceApi get _deviceApi => parent.boundDevice!.driver as ILyfiDeviceApi;
diff --git a/client/lib/devices/borneo/lyfi/view_models/lyfi_view_model.dart b/client/lib/devices/borneo/lyfi/view_models/lyfi_view_model.dart
@@ -3,7 +3,9 @@ import 'package:borneo_app/devices/borneo/lyfi/view_models/settings_view_model.d
 import 'package:borneo_app/devices/borneo/lyfi/view_models/editor/sun_editor_view_model.dart';
 import 'package:borneo_app/devices/borneo/view_models/base_borneo_device_view_model.dart';
 import 'package:borneo_app/services/i_app_notification_service.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/api.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:flutter/foundation.dart';
 import 'package:intl/intl.dart';
 
diff --git a/client/lib/devices/borneo/lyfi/view_models/settings_view_model.dart b/client/lib/devices/borneo/lyfi/view_models/settings_view_model.dart
@@ -2,6 +2,8 @@ import 'package:borneo_app/devices/borneo/lyfi/view_models/base_lyfi_device_view
 import 'package:borneo_app/infrastructure/timezone.dart';
 import 'package:borneo_app/services/i_app_notification_service.dart';
 import 'package:borneo_common/exceptions.dart' as bo_ex;
+import 'package:borneo_kernel/drivers/borneo/lyfi/api.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:cancellation_token/cancellation_token.dart';
 import 'package:geolocator/geolocator.dart';
 
diff --git a/client/lib/devices/borneo/lyfi/views/dashboard/dashboard_view.dart b/client/lib/devices/borneo/lyfi/views/dashboard/dashboard_view.dart
@@ -9,6 +9,7 @@ import 'package:borneo_app/widgets/power_switch.dart';
 import 'package:borneo_app/widgets/rounded_icon_text_button.dart';
 import 'package:borneo_app/widgets/value_listenable_builders.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:flutter/material.dart';
 
 import 'package:gauge_indicator/gauge_indicator.dart';
diff --git a/client/lib/devices/borneo/lyfi/views/editor/manual_editor_view.dart b/client/lib/devices/borneo/lyfi/views/editor/manual_editor_view.dart
@@ -2,6 +2,7 @@ import 'package:borneo_app/devices/borneo/lyfi/view_models/constants.dart';
 import 'package:borneo_app/devices/borneo/lyfi/views/brightness_slider_list.dart';
 import 'package:borneo_app/devices/borneo/lyfi/views/color_chart.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:flutter/material.dart';
 
 import 'package:fl_chart/fl_chart.dart';
diff --git a/client/lib/devices/borneo/lyfi/views/editor/sun_editor_view.dart b/client/lib/devices/borneo/lyfi/views/editor/sun_editor_view.dart
@@ -1,6 +1,7 @@
 import 'package:borneo_app/devices/borneo/lyfi/views/brightness_slider_list.dart';
 import 'package:borneo_app/devices/borneo/lyfi/views/widgets/sun_running_chart.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:flutter/material.dart';
 
 import 'package:provider/provider.dart';
diff --git a/client/lib/devices/borneo/lyfi/views/lyfi_view.dart b/client/lib/devices/borneo/lyfi/views/lyfi_view.dart
@@ -3,6 +3,7 @@ import 'package:borneo_app/models/devices/device_entity.dart';
 import 'package:borneo_app/services/i_app_notification_service.dart';
 import 'package:borneo_common/io/net/rssi.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:event_bus/event_bus.dart';
 import 'package:flutter/material.dart';
 import 'package:logger/logger.dart';
diff --git a/client/lib/devices/borneo/lyfi/views/settings_screen.dart b/client/lib/devices/borneo/lyfi/views/settings_screen.dart
@@ -3,6 +3,7 @@ import 'package:borneo_app/widgets/map_location_picker.dart';
 import 'package:borneo_common/io/net/rssi.dart';
 import 'package:borneo_kernel/drivers/borneo/borneo_device_api.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:latlong2/latlong.dart';
diff --git a/client/lib/devices/borneo/lyfi/views/widgets/manual_running_chart.dart b/client/lib/devices/borneo/lyfi/views/widgets/manual_running_chart.dart
@@ -4,6 +4,7 @@ import 'package:borneo_app/devices/borneo/lyfi/views/color_chart.dart';
 import 'package:borneo_app/views/common/hex_color.dart';
 import 'package:borneo_app/widgets/value_listenable_builders.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
diff --git a/client/lib/devices/borneo/lyfi/views/widgets/sun_running_chart.dart b/client/lib/devices/borneo/lyfi/views/widgets/sun_running_chart.dart
@@ -2,6 +2,7 @@ import 'package:borneo_app/devices/borneo/lyfi/view_models/constants.dart';
 import 'package:borneo_app/views/common/hex_color.dart';
 import 'package:borneo_common/duration_ext.dart';
 import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 
diff --git a/client/packages/borneo_kernel/lib/drivers/borneo/borneo_device_api.dart b/client/packages/borneo_kernel/lib/drivers/borneo/borneo_device_api.dart
@@ -277,7 +277,7 @@ abstract class BorneoDriverData {
   }
 }
 
-mixin BorneoDeviceApiImpl implements IBorneoDeviceApi {
+mixin BorneoDeviceCoapApi implements IBorneoDeviceApi {
   @override
   Future<String> getCompatible(Device dev) async {
     final dd = dev.driverData as BorneoDriverData;
diff --git a/client/packages/borneo_kernel/lib/drivers/borneo/lyfi/api.dart b/client/packages/borneo_kernel/lib/drivers/borneo/lyfi/api.dart
@@ -0,0 +1,44 @@
+import 'package:borneo_kernel/drivers/borneo/borneo_device_api.dart';
+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';
+import 'package:borneo_kernel_abstractions/device.dart';
+
+abstract class ILyfiDeviceApi extends IBorneoDeviceApi {
+  LyfiDeviceInfo getLyfiInfo(Device dev);
+  Future<LyfiDeviceStatus> getLyfiStatus(Device dev);
+
+  Future<LedState> getState(Device dev);
+  Future<void> switchState(Device dev, LedState state);
+
+  Future<LedRunningMode> getMode(Device dev);
+  Future<void> switchMode(Device dev, LedRunningMode mode);
+
+  Future<List<ScheduledInstant>> getSchedule(Device dev);
+  Future<void> setSchedule(Device dev, Iterable<ScheduledInstant> schedule);
+
+  Future<List<int>> getColor(Device dev);
+  Future<void> setColor(Device dev, List<int> color);
+
+  Future<int> getKeepTemp(Device dev);
+
+  Future<LedCorrectionMethod> getCorrectionMethod(Device dev);
+  Future<void> setCorrectionMethod(Device dev, LedCorrectionMethod mode);
+
+  Future<Duration> getTemporaryDuration(Device dev);
+  Future<void> setTemporaryDuration(Device dev, Duration duration);
+
+  Future<GeoLocation?> getLocation(Device dev);
+  Future<void> setLocation(Device dev, GeoLocation location);
+
+  Future<bool> getTimeZoneEnabled(Device dev);
+  Future<void> setTimeZoneEnabled(Device dev, bool enabled);
+
+  Future<int> getTimeZoneOffset(Device dev);
+  Future<void> setTimeZoneOffset(Device dev, int offset);
+
+  Future<AcclimationSettings> getAcclimation(Device dev);
+  Future<void> setAcclimation(Device dev, AcclimationSettings acc);
+  Future<void> terminateAcclimation(Device dev);
+
+  Future<List<ScheduledInstant>> getSunSchedule(Device dev);
+  Future<List<SunCurveItem>> getSunCurve(Device dev);
+}
diff --git a/client/packages/borneo_kernel/lib/drivers/borneo/lyfi/lyfi_driver.dart b/client/packages/borneo_kernel/lib/drivers/borneo/lyfi/lyfi_driver.dart
diff --git a/client/packages/borneo_kernel/lib/drivers/borneo/lyfi/metadata.dart b/client/packages/borneo_kernel/lib/drivers/borneo/lyfi/metadata.dart
diff --git a/client/packages/borneo_kernel/lib/drivers/borneo/lyfi/models.dart b/client/packages/borneo_kernel/lib/drivers/borneo/lyfi/models.dart

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import 'package:borneo_app/devices/borneo/view_models/base_borneo_device_view_model.dart';`
	`2`	`+import 'package:borneo_kernel/drivers/borneo/lyfi/api.dart';`
`2`	`3`	`import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';`
`3`	`4`
`4`	`5`	`abstract class BaseLyfiDeviceViewModel extends BaseBorneoDeviceViewModel {`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import 'package:borneo_kernel/drivers/borneo/lyfi/models.dart';`
`1`	`2`	`import 'package:flutter/foundation.dart';`
`2`	`3`
`3`	`4`	`import 'package:borneo_kernel/drivers/borneo/lyfi/lyfi_driver.dart';`