From ec0f726c937330c6076440c3a8cecd689e1d7018 Mon Sep 17 00:00:00 2001 From: Enzo Date: Thu, 9 Nov 2023 10:09:04 +0100 Subject: [PATCH] Modif de getHeartRateWithTime --- lib/Modele/manager_file.dart | 36 ++++++++++++++++++++++++++---------- lib/View/page_test.dart | 5 +++-- 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/lib/Modele/manager_file.dart b/lib/Modele/manager_file.dart index b3dbe49..8db2d1a 100644 --- a/lib/Modele/manager_file.dart +++ b/lib/Modele/manager_file.dart @@ -71,13 +71,18 @@ class ManagerFile { int firtTimeStamp = 0; for (List ligne in activity.contentActivity) { - if (ligne.length >= 10 && - ligne[0] == "Data" && - ligne[9] == "heart_rate") { - if (firtTimeStamp == 0) { - firtTimeStamp = ligne[4]; + if (ligne[0] == "Data") { + if (ligne.length >= 10 && ligne[9] == "heart_rate") { + if (firtTimeStamp == 0) { + firtTimeStamp = ligne[4]; + } + result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[10]]); + } else if (ligne.length >= 16 && ligne[16] == "heart_rate") { + if (firtTimeStamp == 0) { + firtTimeStamp = ligne[4]; + } + result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[17]]); } - result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[10]]); } } return result; @@ -92,10 +97,21 @@ class ManagerFile { if (firtTimeStamp == 0) { firtTimeStamp = ligne[4]; } - result.add([ - (ligne[4] - firtTimeStamp) ~/ 100, - int.parse(ligne[7].toString()) - ]); + result.add([(ligne[4] - firtTimeStamp) ~/ 100, ligne[7].toInt()]); + } + } + return result; + } + + int getDistance(ActivityOfUser activity) { + int result = 0; + for (int i = activity.contentActivity.length - 1; i >= 0; i--) { + if (activity.contentActivity[i].length >= 8 && + activity.contentActivity[i][0] == "Data" && + activity.contentActivity[i][6] == "distance") { + if (activity.contentActivity[i][7] > result) { + result = activity.contentActivity[i][7].toInt(); + } } } return result; diff --git a/lib/View/page_test.dart b/lib/View/page_test.dart index fbb3028..37f781b 100644 --- a/lib/View/page_test.dart +++ b/lib/View/page_test.dart @@ -66,8 +66,9 @@ class _TestPage extends State { print("t"); } else { List result = await x.readFitFile(y!); - //print(x.getHeartRateWithTime(ActivityOfUser(result))); - print(x.getDistanceWithTime(ActivityOfUser(result))); + print(x.getHeartRateWithTime(ActivityOfUser(result))); + //print(x.getDistanceWithTime(ActivityOfUser(result))); + //print(x.getDistance(ActivityOfUser(result))); } }