Skip to content

Commit d2f7e72

Browse files
committed
fix(circuit): apply timezone
1 parent 71afa75 commit d2f7e72

File tree

2 files changed

+28
-17
lines changed

2 files changed

+28
-17
lines changed

lib/Screens/Racing/circuit.dart

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,20 @@ class CircuitScreenContent extends StatelessWidget {
256256
Session(
257257
session['state'],
258258
session['session'],
259-
DateTime.parse(session['endTime']),
260-
DateTime.parse(session['startTime']),
259+
DateTime.parse(
260+
session['endTime'] + session['gmtOffset'])
261+
.toLocal(),
262+
DateTime.parse(
263+
session['startTime'] + session['gmtOffset'])
264+
.toLocal(),
261265
null,
262-
DateTime.now().isBefore(
263-
DateTime.parse(session['endTime'])) &&
264-
DateTime.now().isAfter(
265-
DateTime.parse(session['startTime'])),
266+
DateTime.now().isBefore(DateTime.parse(
267+
session['endTime'] + session['gmtOffset'])
268+
.toLocal()) &&
269+
DateTime.now().isAfter(DateTime.parse(
270+
session['startTime'] +
271+
session['gmtOffset'])
272+
.toLocal()),
266273
),
267274
details['race']['meetingCountryName'],
268275
details['race']['meetingOfficialName'],

lib/main.dart

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,21 @@ class NotificationController {
182182
@pragma("vm:entry-point")
183183
static Future<void> onActionReceivedMethod(
184184
ReceivedAction receivedAction) async {
185-
RouterLocalConfig.router.pushNamed(
186-
'article',
187-
pathParameters: receivedAction.payload?['title'] != null
188-
? {
189-
'id': receivedAction.payload?['id'] ?? '',
190-
'articleName': receivedAction.payload!['title']!,
191-
}
192-
: {
193-
'id': receivedAction.payload?['id'] ?? '',
194-
},
195-
);
185+
if ((receivedAction.channelKey ?? '') == 'newArticle') {
186+
RouterLocalConfig.router.pushNamed(
187+
'article',
188+
pathParameters: receivedAction.payload?['title'] != null
189+
? {
190+
'id': receivedAction.payload?['id'] ?? '',
191+
'articleName': receivedAction.payload!['title']!,
192+
}
193+
: {
194+
'id': receivedAction.payload?['id'] ?? '',
195+
},
196+
);
197+
} else {
198+
RouterLocalConfig.router.pushNamed('race-hub');
199+
}
196200
}
197201
}
198202

0 commit comments

Comments
 (0)