From 8c946917649b57dac3fc5ce8471c5ac0f5739d8c Mon Sep 17 00:00:00 2001 From: kleponijo <158453666+kleponijo@users.noreply.github.com> Date: Thu, 21 May 2026 22:03:23 +0700 Subject: [PATCH] oke --- .../wind_speed/blocs/wind_speed_bloc.dart | 4 +- .../lib/src/firebase_monitoring_repo.dart | 71 +++++++++++++++++++ .../lib/src/models/wind_speed.dart | 28 +++++--- pubspec.lock | 2 +- pubspec.yaml | 6 +- 5 files changed, 97 insertions(+), 14 deletions(-) diff --git a/lib/screens/monitoring/wind_speed/blocs/wind_speed_bloc.dart b/lib/screens/monitoring/wind_speed/blocs/wind_speed_bloc.dart index e618a2c..30936df 100644 --- a/lib/screens/monitoring/wind_speed/blocs/wind_speed_bloc.dart +++ b/lib/screens/monitoring/wind_speed/blocs/wind_speed_bloc.dart @@ -41,7 +41,7 @@ class WindSpeedBloc extends Bloc { emit(state.copyWith(isLoading: true)); final history = await _repository.getSensorHistory( - 'anemometer/history', + 'anemometer/esp_percobaan/history', (json) => MyWindSpeed.fromJson(json), ); @@ -85,7 +85,7 @@ class WindSpeedBloc extends Bloc { await _subscription?.cancel(); _subscription = _repository .getSensorStream( - 'anemometer/realtime', + 'anemometer/esp_percobaan/realtime', (json) => MyWindSpeed.fromJson(json), ) .listen((data) { diff --git a/packages/monitoring_repository/lib/src/firebase_monitoring_repo.dart b/packages/monitoring_repository/lib/src/firebase_monitoring_repo.dart index 6155249..d5d2925 100644 --- a/packages/monitoring_repository/lib/src/firebase_monitoring_repo.dart +++ b/packages/monitoring_repository/lib/src/firebase_monitoring_repo.dart @@ -73,4 +73,75 @@ class FirebaseMonitoringRepo implements MonitoringRepository { return []; } } + + // ── Baca settings dari Firebase ────────────────────────────── + Future> getAnemometerSettings() async { + try { + final snapshot = await _db.ref('anemometer/settings').get(); + if (snapshot.exists && snapshot.value is Map) { + final raw = snapshot.value as Map; + return { + 'k_faktor': (raw['k_faktor'] ?? 50.0).toDouble(), + 'interval_realtime_ms': (raw['interval_realtime_ms'] ?? 1000) as int, + 'interval_history_ms': (raw['interval_history_ms'] ?? 3600000) as int, + }; + } + } catch (_) {} + return { + 'k_faktor': 50.0, + 'interval_realtime_ms': 1000, + 'interval_history_ms': 3600000, + }; + } + + // ── Tulis settings ke Firebase (dari app) ──────────────────── + Future updateAnemometerSettings({ + double? kFaktor, + int? intervalRealtimeMs, + int? intervalHistoryMs, + }) async { + final updates = {}; + if (kFaktor != null) updates['k_faktor'] = kFaktor; + if (intervalRealtimeMs != null) + updates['interval_realtime_ms'] = intervalRealtimeMs; + if (intervalHistoryMs != null) + updates['interval_history_ms'] = intervalHistoryMs; + if (updates.isNotEmpty) { + await _db.ref('anemometer/settings').update(updates); + } + } + + // ── Ambil logs dari device tertentu ────────────────────────── + Future>> getDeviceLogs( + String deviceId, { + int limit = 50, + }) async { + try { + final snapshot = await _db + .ref('anemometer/$deviceId/logs') + .orderByKey() + .limitToLast(limit) + .get(); + + if (snapshot.exists && snapshot.value is Map) { + final raw = snapshot.value as Map; + final list = raw.entries.map((e) { + final v = e.value as Map; + return { + 'msg': v['msg'] ?? '', + 'timestamp': DateTime.fromMillisecondsSinceEpoch( + (v['timestamp'] ?? 0) * 1000, + ).toLocal(), + }; + }).toList(); + list.sort( + (a, b) => (b['timestamp'] as DateTime).compareTo( + a['timestamp'] as DateTime, + ), + ); + return list; + } + } catch (_) {} + return []; + } } diff --git a/packages/monitoring_repository/lib/src/models/wind_speed.dart b/packages/monitoring_repository/lib/src/models/wind_speed.dart index b35d05a..e0b75d3 100644 --- a/packages/monitoring_repository/lib/src/models/wind_speed.dart +++ b/packages/monitoring_repository/lib/src/models/wind_speed.dart @@ -1,22 +1,34 @@ class MyWindSpeed { - double speed; + final double speed; // realtime: speed_ms | history: avg_ms + final double maxSpeed; // history only (0 jika dari realtime) + final double kFaktor; + final int sampleCount; + final DateTime timestamp; - DateTime timestamp; - - MyWindSpeed({required this.speed, required this.timestamp}); + MyWindSpeed({ + required this.speed, + this.maxSpeed = 0.0, + this.kFaktor = 1.0, + this.sampleCount = 0, + required this.timestamp, + }); static final empty = MyWindSpeed( speed: 0.0, - timestamp: DateTime.fromMillisecondsSinceEpoch(0), ); + // Dipakai untuk realtime node factory MyWindSpeed.fromJson(Map json) { return MyWindSpeed( - speed: (json['speed'] ?? 0).toDouble(), - + // support field lama 'speed' dan baru 'speed_ms'/'avg_ms' + speed: ((json['speed_ms'] ?? json['avg_ms'] ?? json['speed']) ?? 0) + .toDouble(), + maxSpeed: (json['max_ms'] ?? 0).toDouble(), + kFaktor: (json['k_faktor'] ?? 1.0).toDouble(), + sampleCount: (json['sample_count'] ?? 0) as int, timestamp: DateTime.fromMillisecondsSinceEpoch( - (json['timestamp'] ?? 0) * 1000, // kalau dari Unix detik + (json['timestamp'] ?? 0) * 1000, ).toLocal(), ); } diff --git a/pubspec.lock b/pubspec.lock index 9e4a96f..2d8bdf9 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -781,7 +781,7 @@ packages: source: hosted version: "7.1.0" shared_preferences: - dependency: transitive + dependency: "direct main" description: name: shared_preferences sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf diff --git a/pubspec.yaml b/pubspec.yaml index c942fee..5833dbd 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -32,16 +32,16 @@ dependencies: printing: ^5.13.1 rxdart: ^0.27.7 share_plus: ^13.1.0 + shared_preferences: ^2.5.5 table_calendar: ^3.1.2 user_repository: path: packages/user_repository dev_dependencies: - flutter_test: - sdk: flutter - flutter_lints: ^3.0.0 flutter_native_splash: ^2.4.4 + flutter_test: + sdk: flutter flutter_native_splash: color: '#D3D3D3'