DAFLDev
/
dafl_music
6
6
Fork 0
Code Issues 23 Pull Requests Packages Projects 1 Releases Wiki Activity

Merge branch 'Link_UserList_To_SpotifyInfo'
continuous-integration/drone/push Build is failing Details

Browse Source
messagerie_lucas_test
dorian.hodin 2 years ago
parent 5ec32fe705 35232657e5
commit 9e5c49d7ac
4 changed files with 76 additions and 31 deletions
Show Stats Download Patch File Download Diff File

38
.idea/libraries/Dart_SDK.xml
Unescape View File

@ -1,25 +1,25 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="Dart SDK"> <library name="Dart SDK">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/async" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/async" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/cli" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/cli" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/collection" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/collection" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/convert" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/convert" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/core" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/core" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/developer" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/developer" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/ffi" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/ffi" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/html" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/html" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/indexed_db" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/indexed_db" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/io" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/io" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/isolate" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/isolate" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/js" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/js" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/js_util" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/js_util" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/math" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/math" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/mirrors" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/mirrors" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/svg" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/svg" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/typed_data" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/typed_data" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/web_audio" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/web_audio" />
<root url="file://$PROJECT_DIR$/../flutter/bin/cache/dart-sdk/lib/web_gl" /> <root url="file://Z:/flutter/bin/cache/dart-sdk/lib/web_gl" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />

45
Sources/dafl_project_flutter/lib/model/user.dart
Unescape View File

@ -1,10 +1,15 @@
import '../api/track.dart'; import 'dart:async';
import '../../../api/track.dart';
import '../../../position/location.dart';
import '../exceptions/api_exception.dart'; import '../exceptions/api_exception.dart';
import '../main.dart'; import '../main.dart';
import 'conversation.dart'; import 'conversation.dart';
import 'music.dart'; import 'music.dart';
import 'spot.dart'; import 'spot.dart';
Timer? timer;
int test=0;
class User { class User {
//attributes from DAFL //attributes from DAFL
late int idDafl; late int idDafl;
@ -64,7 +69,43 @@ class User {
_id = await MyApp.api.getCurrentlyPlayingTrack(); _id = await MyApp.api.getCurrentlyPlayingTrack();
track = await MyApp.api.getTrackInfo(_id); track = await MyApp.api.getTrackInfo(_id);
} on ApiException { } on ApiException {
// TODO : add notification to show that an error occured // TODO : add notification to show that an error occurred
}
}
void listspots (){
Future<String>? rep;
int i;
rep = Location.sendCurrentLocation();
List<Future<Music>> futureMusicList = [];
List<List<String>> musicId = [];
rep.then((String result) {
List<String> tab = result.split(",");
if (tab.isEmpty!=true) {
for (i = 0; i < tab.length; i++) {
musicId.add(tab[i].split("-"));
}
/*
for (i = 0; i < musicId.length; i++) {
// futuretracklist.add(MyApp.api.getTrackInfo(trackid[i][1]));
}
futureMusicList[i].then((Music m) {
for (i = 0; i < futureMusicList.length; i++) {
discovery.add(m);
}
});
*/ // EN COMMENTAIRE PARCE QUE ERREUR SINON VU QUE J'AI PAS MUSIC POUR L'INSTANT
}
});
}
void getListSpots(){
if (test==0){
test=1;
listspots();
}else{
timer = Timer.periodic(const Duration(seconds: 72), (Timer t) => listspots());
} }
} }

11
Sources/dafl_project_flutter/lib/position/location.dart
Unescape View File

@ -1,12 +1,13 @@
import 'dart:developer';
import 'package:geolocator/geolocator.dart'; import 'package:geolocator/geolocator.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'dart:convert'; import 'dart:convert';
import 'dart:async'; import 'dart:async';
import '../main.dart'; import '../main.dart';
class Location { class Location {
static Future sendCurrentLocation() async { static Future<String> sendCurrentLocation() async {
Uri uri = Uri.parse("http://89.83.53.34/phpmyadmin/dafldev/insert.php"); Uri uri = Uri.parse("http://89.83.53.34/phpmyadmin/dafldev/insert.php");
LocationPermission permission; LocationPermission permission;
permission = await Geolocator.checkPermission(); permission = await Geolocator.checkPermission();
@ -29,7 +30,7 @@ class Location {
return getData(); return getData();
} }
static Future getData() async { static Future<String> getData() async {
String actualUser = MyApp.controller.currentUser.usernameDafl; String actualUser = MyApp.controller.currentUser.usernameDafl;
Uri uri = Uri.parse("http://89.83.53.34/phpmyadmin/dafldev/distance.php"); Uri uri = Uri.parse("http://89.83.53.34/phpmyadmin/dafldev/distance.php");
http.Response response = await http.post(uri, body: { http.Response response = await http.post(uri, body: {
@ -38,4 +39,8 @@ class Location {
var data = jsonDecode(response.body); var data = jsonDecode(response.body);
return data.toString(); return data.toString();
} }
} }

9
Sources/dafl_project_flutter/lib/views/pages/main/p_main.dart
Unescape View File

@ -1,6 +1,5 @@
import 'dart:async'; import 'package:dafl_project_flutter/main.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import '../../../position/location.dart';
import '../../../presentation/custom_icons_icons.dart'; import '../../../presentation/custom_icons_icons.dart';
import './w_settings.dart'; import './w_settings.dart';
import './w_spot.dart'; import './w_spot.dart';
@ -8,7 +7,8 @@ import './w_discovery.dart';
import './w_profile.dart'; import './w_profile.dart';
import './w_messages.dart'; import './w_messages.dart';
import 'w_top.dart'; import 'w_top.dart';
Timer? timer;
class MainPage extends StatefulWidget { class MainPage extends StatefulWidget {
const MainPage({Key? key}) : super(key: key); const MainPage({Key? key}) : super(key: key);
@ -32,8 +32,7 @@ class _MainPageState extends State<MainPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Location.sendCurrentLocation(); MyApp.controller.currentUser.getListSpots();
timer = Timer.periodic(const Duration(seconds: 72), (Timer t) => Location.sendCurrentLocation());
double height = MediaQuery.of(context).size.height; double height = MediaQuery.of(context).size.height;
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: false, resizeToAvoidBottomInset: false,

Write Preview
Loading…
Cancel
Save