ImBenji/Bus-Infotainment--IBus-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more

Browse Source
This commit is contained in:
ImBenji
2024-02-28 22:52:24 +00:00
parent 8b8cb0412f
commit 67e1cd3530
2 changed files with 253 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

321
lib/pages/home.dart
View File

@@ -18,43 +18,16 @@ class pages_Home extends StatelessWidget {
child: Column( child: SingleChildScrollView(
children: [ child: Column(
children: [
Container( Container(
height: 2, height: 2,
color: Colors.white70, color: Colors.white70,
),
Container(
decoration: BoxDecoration(
color: Colors.grey.shade900,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.3),
blurRadius: 2,
spreadRadius: 4
)
]
), ),
margin: EdgeInsets.all(20), Container(
child: ibus_display(),
),
Container(
height: 2,
color: Colors.white70,
),
Container(
margin: EdgeInsets.all(20),
child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.grey.shade900, color: Colors.grey.shade900,
@@ -67,147 +40,185 @@ class pages_Home extends StatelessWidget {
] ]
), ),
child: ManualAnnouncementPicker( margin: EdgeInsets.all(20),
backgroundColor: Colors.grey.shade900,
outlineColor: Colors.white70, child: ibus_display(),
announcements: [
...LiveInformation().manualAnnouncements
],
),
), ),
), Container(
height: 2,
color: Colors.white70,
),
Container( Container(
height: 2,
color: Colors.white70,
),
Container( margin: EdgeInsets.all(20),
margin: EdgeInsets.all(20), child: Container(
child: Container( decoration: BoxDecoration(
decoration: BoxDecoration(
color: Colors.grey.shade900, color: Colors.grey.shade900,
boxShadow: [ boxShadow: [
BoxShadow( BoxShadow(
color: Colors.black.withOpacity(0.3), color: Colors.black.withOpacity(0.3),
blurRadius: 2, blurRadius: 2,
spreadRadius: 4 spreadRadius: 4
) )
] ]
),
child: ManualAnnouncementPicker(
backgroundColor: Colors.grey.shade900,
outlineColor: Colors.white70,
announcements: [
...LiveInformation().manualAnnouncements
],
),
), ),
child: DelegateBuilder<BusRouteVariant>( ),
delegate: LiveInformation().routeVariantDelegate,
builder: (context, routeVariant) { Container(
print("rebuilt stop announcement picker"); height: 2,
return StopAnnouncementPicker( color: Colors.white70,
routeVariant: routeVariant, ),
backgroundColor: Colors.grey.shade900,
outlineColor: Colors.white70, Container(
);
}, margin: EdgeInsets.all(20),
defaultBuilder: (context) {
BusRouteVariant? routeVariant = LiveInformation().getRouteVariant(); child: Container(
if (routeVariant == null) {
return Container( decoration: BoxDecoration(
color: Colors.grey.shade900, color: Colors.grey.shade900,
child: Center( boxShadow: [
child: Text( BoxShadow(
"No route selected", color: Colors.black.withOpacity(0.3),
style: GoogleFonts.teko( blurRadius: 2,
fontSize: 25, spreadRadius: 4
color: Colors.white70 )
), ]
), ),
),
); child: DelegateBuilder<BusRouteVariant>(
} else { delegate: LiveInformation().routeVariantDelegate,
builder: (context, routeVariant) {
print("rebuilt stop announcement picker");
return StopAnnouncementPicker( return StopAnnouncementPicker(
routeVariant: routeVariant, routeVariant: routeVariant,
backgroundColor: Colors.grey.shade900, backgroundColor: Colors.grey.shade900,
outlineColor: Colors.white70, outlineColor: Colors.white70,
); );
} },
}, defaultBuilder: (context) {
BusRouteVariant? routeVariant = LiveInformation().getRouteVariant();
if (routeVariant == null) {
return Container(
color: Colors.grey.shade900,
child: Center(
child: Text(
"No route selected",
style: GoogleFonts.teko(
fontSize: 25,
color: Colors.white70
),
),
),
);
} else {
return StopAnnouncementPicker(
routeVariant: routeVariant,
backgroundColor: Colors.grey.shade900,
outlineColor: Colors.white70,
);
}
},
),
), ),
), ),
), ElevatedButton(
onPressed: () async {
LiveInformation liveInformation = LiveInformation();
liveInformation.queueAnnouncement(await liveInformation.getDestinationAnnouncement(liveInformation.getRouteVariant()!, sendToServer: true));
},
child: Text("Announce Destination"),
),
// Container(
//
// margin: EdgeInsets.all(20),
//
// height: 300-45,
//
// child: ListView(
//
// scrollDirection: Axis.vertical,
//
// children: [
//
// ElevatedButton(
// onPressed: () async {
// LiveInformation liveInformation = LiveInformation();
// liveInformation.queueAnnouncement(await liveInformation.getDestinationAnnouncement(liveInformation.getRouteVariant()!, sendToServer: false));
// },
// child: Text("Test announcement"),
// ),
//
// ElevatedButton(
// onPressed: () {
// LiveInformation liveInformation = LiveInformation();
// liveInformation.updateServer();
// },
// child: Text("Update server"),
// ),
//
// SizedBox(
//
// width: 100,
//
// child: TextField(
// onChanged: (String value) {
// LiveInformation liveInformation = LiveInformation();
// // liveInformation.documentID = value;
// },
// ),
// ),
//
// SizedBox(
//
// width: 200,
//
// child: TextField(
// onSubmitted: (String value) {
// LiveInformation liveInformation = LiveInformation();
// liveInformation.queueAnnouncement(AnnouncementQueueEntry(
// displayText: value,
// audioSources: []
// ));
// },
// ),
// ),
//
// ElevatedButton(
// onPressed: () {
// LiveInformation liveInformation = LiveInformation();
// liveInformation.pullServer();
// },
// child: Text("Pull server"),
// ),
//
// ],
//
// ),
//
// ),
], // Container(
//
// margin: EdgeInsets.all(20),
//
// height: 300-45,
//
// child: ListView(
//
// scrollDirection: Axis.vertical,
//
// children: [
//
// ElevatedButton(
// onPressed: () async {
// LiveInformation liveInformation = LiveInformation();
// liveInformation.queueAnnouncement(await liveInformation.getDestinationAnnouncement(liveInformation.getRouteVariant()!, sendToServer: false));
// },
// child: Text("Test announcement"),
// ),
//
// ElevatedButton(
// onPressed: () {
// LiveInformation liveInformation = LiveInformation();
// liveInformation.updateServer();
// },
// child: Text("Update server"),
// ),
//
// SizedBox(
//
// width: 100,
//
// child: TextField(
// onChanged: (String value) {
// LiveInformation liveInformation = LiveInformation();
// // liveInformation.documentID = value;
// },
// ),
// ),
//
// SizedBox(
//
// width: 200,
//
// child: TextField(
// onSubmitted: (String value) {
// LiveInformation liveInformation = LiveInformation();
// liveInformation.queueAnnouncement(AnnouncementQueueEntry(
// displayText: value,
// audioSources: []
// ));
// },
// ),
// ),
//
// ElevatedButton(
// onPressed: () {
// LiveInformation liveInformation = LiveInformation();
// liveInformation.pullServer();
// },
// child: Text("Pull server"),
// ),
//
// ],
//
// ),
//
// ),
],
),
) )
); );
@@ -535,10 +546,8 @@ class StopAnnouncementPicker extends ManualAnnouncementPicker {
ManualAnnouncementEntry( ManualAnnouncementEntry(
shortName: stop.formattedStopName, shortName: stop.formattedStopName,
informationText: stop.formattedStopName, informationText: stop.formattedStopName,
audioSources: [ audioFileNames: [
// AudioWrapperByteSource( stop.getAudioFileName()
// LiveInformation().announcementCache[stop.getAudioFileName()]
// )
] ]
) )
] ]

145
lib/singletons/live_information.dart
View File

@@ -101,7 +101,6 @@ class LiveInformation {
AudioWrapper audioPlayer = AudioWrapper(); AudioWrapper audioPlayer = AudioWrapper();
AnnouncementCache announcementCache = AnnouncementCache(); AnnouncementCache announcementCache = AnnouncementCache();
List<AnnouncementQueueEntry> announcementQueue = []; List<AnnouncementQueueEntry> announcementQueue = [];
AnnouncementQueueEntry? lastAnnouncement;
DateTime lastAnnouncementTimeStamp = DateTime.now().toUtc(); DateTime lastAnnouncementTimeStamp = DateTime.now().toUtc();
EventDelegate<AnnouncementQueueEntry> announcementDelegate = EventDelegate(); EventDelegate<AnnouncementQueueEntry> announcementDelegate = EventDelegate();
String _currentAnnouncement = "*** NO MESSAGE ***"; String _currentAnnouncement = "*** NO MESSAGE ***";
@@ -133,6 +132,7 @@ class LiveInformation {
// print("Q Difference: ${milisecondDifference}"); // print("Q Difference: ${milisecondDifference}");
if (milisecondDifference <= timerInterval) { if (milisecondDifference <= timerInterval) {
// Account for the time lost by the periodic timer // Account for the time lost by the periodic timer
announcementQueue.remove(announcement);
await Future.delayed(Duration(milliseconds: timerInterval - milisecondDifference)); await Future.delayed(Duration(milliseconds: timerInterval - milisecondDifference));
} else { } else {
print("Due in: ${milisecondDifference}ms"); print("Due in: ${milisecondDifference}ms");
@@ -140,8 +140,7 @@ class LiveInformation {
} }
} }
} }
announcementQueue.removeAt(0);
lastAnnouncement = announcement;
isPlayingAnnouncement = true; isPlayingAnnouncement = true;
if (kIsWeb) { if (kIsWeb) {
@@ -161,10 +160,12 @@ class LiveInformation {
Duration? duration = await audioPlayer.play(source); Duration? duration = await audioPlayer.play(source);
await Future.delayed(duration!); await Future.delayed(duration!);
await Future.delayed(Duration(milliseconds: 150)); if (announcement.audioSources.last != source) {
await Future.delayed(Duration(milliseconds: 500));
}
} }
} finally {
audioPlayer.stop(); audioPlayer.stop();
} catch (e) {
} }
} else { } else {
@@ -173,8 +174,13 @@ class LiveInformation {
} }
} }
if (announcementQueue.contains(announcement)) {
announcementQueue.remove(announcement);
}
isPlayingAnnouncement = false; isPlayingAnnouncement = false;
print("Popped announcement queue"); print("Popped announcement queue");
print("Queue length after: ${announcementQueue.length}");
} }
} }
} }
@@ -283,6 +289,26 @@ class LiveInformation {
print("Audios: ${announcement.audioSources.length}"); print("Audios: ${announcement.audioSources.length}");
return; return;
} else if (announcement is ManualAnnouncementEntry) {
List<AudioWrapperSource> audioSources = [];
for (String filename in announcement.audioFileNames) {
audioSources.add(AudioWrapperByteSource(announcementCache[filename]));
}
announcementQueue.add(
ManualAnnouncementEntry(
shortName: announcement.shortName,
informationText: announcement.displayText,
audioFileNames: announcement.audioFileNames,
audioSources: audioSources,
sendToServer: false,
)
);
print("Queued manual announcement: ${announcement.displayText} (no server)");
return;
} }
announcementQueue.add(announcement); announcementQueue.add(announcement);
@@ -323,35 +349,13 @@ class LiveInformation {
// 5 sedonds in the future // 5 sedonds in the future
DateTime scheduledTime = (await getNow()).add(Duration(seconds: 1)); DateTime scheduledTime = (await getNow()).add(Duration(seconds: 1));
print("debug2");
List<String> audioFileNames = [];
for (AudioWrapperSource source in announcement.audioSources) {
if (source is AudioWrapperByteSource) {
Uint8List? bytes = await source.bytes;
String? filename = null;
for (String key in announcementCache.keys) {
if (announcementCache[key] == bytes) {
filename = key;
break;
}
}
}
}
final document = databases.createDocument( final document = databases.createDocument(
documentId: appwrite.ID.unique(), documentId: appwrite.ID.unique(),
databaseId: ApiConstants.INFO_Q_DATABASE_ID, databaseId: ApiConstants.INFO_Q_DATABASE_ID,
collectionId: ApiConstants.MANUAL_Q_COLLECTION_ID, collectionId: ApiConstants.MANUAL_Q_COLLECTION_ID,
data: { data: {
"DisplayText": announcement.displayText, "DisplayText": announcement.displayText,
"AudioFileNames": audioFileNames, "AudioFileNames": announcement.audioFileNames,
"ScheduledTime": scheduledTime.toIso8601String(), "ScheduledTime": scheduledTime.toIso8601String(),
"SessionID": sessionID, "SessionID": sessionID,
@@ -603,47 +607,6 @@ class LiveInformation {
} }
} }
// Pull the manual queue
{
final manual_q = await databases.listDocuments(
databaseId: ApiConstants.INFO_Q_DATABASE_ID,
collectionId: ApiConstants.MANUAL_Q_COLLECTION_ID,
queries: [
appwrite.Query.search("SessionID", sessionID),
appwrite.Query.limit(25),
appwrite.Query.offset(0),
appwrite.Query.orderDesc('\$createdAt')
]
);
for (models.Document doc in manual_q.documents) {
List<AudioWrapperSource> audioSources = [];
for (String filename in doc.data["AudioFileNames"]) {
audioSources.add(AudioWrapperByteSource(announcementCache[filename]));
}
ManualAnnouncementEntry announcement_clone =
ManualAnnouncementEntry(
sendToServer: false,
shortName: "",
informationText: doc.data["DisplayText"],
audioSources: [...audioSources],
scheduledTime: doc.data["ScheduledTime"] != null
? DateTime.parse(doc.data["ScheduledTime"])
: null,
);
// sort the queue by timestamp, so the oldest announcements are at the front
queue.add(announcement_clone);
}
}
// pull the destination queue // pull the destination queue
{ {
final dest_q = await databases.listDocuments( final dest_q = await databases.listDocuments(
@@ -681,6 +644,45 @@ class LiveInformation {
} }
} }
// Pull the manual queue
{
final manual_q = await databases.listDocuments(
databaseId: ApiConstants.INFO_Q_DATABASE_ID,
collectionId: ApiConstants.MANUAL_Q_COLLECTION_ID,
queries: [
appwrite.Query.search("SessionID", sessionID),
appwrite.Query.limit(25),
appwrite.Query.offset(0),
appwrite.Query.orderDesc('\$createdAt')
]
);
for (models.Document doc in manual_q.documents) {
List<String> audioFileNames = doc.data["AudioFileNames"].cast<String>();
ManualAnnouncementEntry announcement_clone =
ManualAnnouncementEntry(
sendToServer: false,
shortName: "",
informationText: doc.data["DisplayText"],
audioFileNames: audioFileNames,
scheduledTime: doc.data["ScheduledTime"] != null
? DateTime.parse(doc.data["ScheduledTime"])
: null,
);
// sort the queue by timestamp, so the oldest announcements are at the front
queue.add(announcement_clone);
}
}
for (AnnouncementQueueEntry entry in queue) { for (AnnouncementQueueEntry entry in queue) {
// Dont queue announcements that are older than now // Dont queue announcements that are older than now
@@ -749,6 +751,7 @@ class LiveInformation {
manual_q_subscription = null; manual_q_subscription = null;
destination_q_subscription?.close(); destination_q_subscription?.close();
destination_q_subscription = null; destination_q_subscription = null;
print("Restarting realtime");
setupRealtime(); setupRealtime();
} }
@@ -788,11 +791,13 @@ class NamedAnnouncementQueueEntry extends AnnouncementQueueEntry {
class ManualAnnouncementEntry extends NamedAnnouncementQueueEntry { class ManualAnnouncementEntry extends NamedAnnouncementQueueEntry {
final List<String> audioFileNames;
ManualAnnouncementEntry({ ManualAnnouncementEntry({
required String shortName, required String shortName,
required String informationText, required String informationText,
required List<AudioWrapperSource> audioSources, required this.audioFileNames,
List<AudioWrapperSource> audioSources = const [],
DateTime? scheduledTime, DateTime? scheduledTime,
DateTime? timestamp, DateTime? timestamp,
bool sendToServer = true, bool sendToServer = true,