Umstellung auf UTC Timestamp
This commit is contained in:
1 parent
d5ec222efd
commit
6154bf833e
8 files changed
+14
-17
No files matched your search
@@ -195,7 +195,7 @@ class _ApproachAreaPageState extends State<ApproachAreaPage> with ProducerMixin,
|
|||||||
|
|
||||||
if (position != null) {
|
if (position != null) {
|
||||||
setPosMessage.track = ZipTrack();
|
setPosMessage.track = ZipTrack();
|
||||||
setPosMessage.track!.time = Util.toUnixMillisUtc(DateTime.now());
|
setPosMessage.track!.time = Util.nowUnixSecondsUtc();
|
||||||
setPosMessage.track!.pos = ZipTrackPos();
|
setPosMessage.track!.pos = ZipTrackPos();
|
||||||
setPosMessage.track!.pos!.lat = position.latitude;
|
setPosMessage.track!.pos!.lat = position.latitude;
|
||||||
setPosMessage.track!.pos!.long = position.longitude;
|
setPosMessage.track!.pos!.long = position.longitude;
|
||||||
|
|||||||
@@ -231,7 +231,7 @@ class _AssignedJobsPageState extends State<AssignedJobsPage> with ProducerMixin,
|
|||||||
message.ver = job.ver.toString();
|
message.ver = job.ver.toString();
|
||||||
message.item = item;
|
message.item = item;
|
||||||
message.track = Track();
|
message.track = Track();
|
||||||
message.track.time = Util.toUnixMillisUtc(DateTime.now().toUtc());
|
message.track.time = Util.nowUnixSecondsUtc();
|
||||||
message.track.pos = FinTaskPos();
|
message.track.pos = FinTaskPos();
|
||||||
message.track.pos!.lat = currentPosition != null ? currentPosition.latitude : 0.0;
|
message.track.pos!.lat = currentPosition != null ? currentPosition.latitude : 0.0;
|
||||||
message.track.pos!.long = currentPosition != null ? currentPosition.longitude : 0.0;
|
message.track.pos!.long = currentPosition != null ? currentPosition.longitude : 0.0;
|
||||||
|
|||||||
@@ -420,7 +420,7 @@ class _MainPageState extends State<MainPage> with ConsumerMixin, ProducerMixin {
|
|||||||
var logoutMessage = LogoutMessage();
|
var logoutMessage = LogoutMessage();
|
||||||
if (position != null) {
|
if (position != null) {
|
||||||
logoutMessage.pos = LogoutMessagePosition();
|
logoutMessage.pos = LogoutMessagePosition();
|
||||||
logoutMessage.pos!.time = Util.toUnixMillisUtc(position.timestamp);
|
logoutMessage.pos!.time = Util.toUnixSecondsUtc(position.timestamp);
|
||||||
logoutMessage.pos!.lat = position.latitude;
|
logoutMessage.pos!.lat = position.latitude;
|
||||||
logoutMessage.pos!.long = position.longitude;
|
logoutMessage.pos!.long = position.longitude;
|
||||||
logoutMessage.pos!.acc = position.accuracy.toInt();
|
logoutMessage.pos!.acc = position.accuracy.toInt();
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ class _MessagesPageState extends State<MessagesPage> with ProducerMixin {
|
|||||||
message.text = text.text;
|
message.text = text.text;
|
||||||
message.from = _sid;
|
message.from = _sid;
|
||||||
message.subj = '';
|
message.subj = '';
|
||||||
message.time = Util.toUnixMillisUtc(now.toUtc());
|
message.time = Util.nowUnixSecondsUtc();
|
||||||
message.read = true;
|
message.read = true;
|
||||||
message.id = await sbmessage.ChatMessage.getNextId();
|
message.id = await sbmessage.ChatMessage.getNextId();
|
||||||
|
|
||||||
@@ -214,7 +214,7 @@ class _MessagesPageState extends State<MessagesPage> with ProducerMixin {
|
|||||||
|
|
||||||
var chatMessagesShowed = ChatMessagesReceived();
|
var chatMessagesShowed = ChatMessagesReceived();
|
||||||
chatMessagesShowed.ids = chatMessageIds;
|
chatMessagesShowed.ids = chatMessageIds;
|
||||||
chatMessagesShowed.time = Util.toUnixMillisUtc(DateTime.now().toUtc());
|
chatMessagesShowed.time = Util.nowUnixSecondsUtc();
|
||||||
|
|
||||||
sendMessage(
|
sendMessage(
|
||||||
routingKey: Constants.messageTopicPublishPayload,
|
routingKey: Constants.messageTopicPublishPayload,
|
||||||
|
|||||||
@@ -489,12 +489,12 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
|||||||
message.trId = widget.tour.id;
|
message.trId = widget.tour.id;
|
||||||
message.task = Task();
|
message.task = Task();
|
||||||
message.task.sId = taskInfo.task.sId;
|
message.task.sId = taskInfo.task.sId;
|
||||||
message.task.time = Util.toUnixMillisUtc(DateTime.now().toUtc());
|
message.task.time = Util.nowUnixSecondsUtc();
|
||||||
|
|
||||||
var position = await MyApp.getCurrentPosition();
|
var position = await MyApp.getCurrentPosition();
|
||||||
if (position != null) {
|
if (position != null) {
|
||||||
message.task.pos = FinTaskPos();
|
message.task.pos = FinTaskPos();
|
||||||
message.task.pos!.time = Util.toUnixMillisUtc(position.timestamp);
|
message.task.pos!.time = Util.toUnixSecondsUtc(position.timestamp);
|
||||||
message.task.pos!.lat = position.latitude;
|
message.task.pos!.lat = position.latitude;
|
||||||
message.task.pos!.long = position.longitude;
|
message.task.pos!.long = position.longitude;
|
||||||
} else {
|
} else {
|
||||||
@@ -512,10 +512,10 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
|||||||
|
|
||||||
var finTourTask = FinTourTask();
|
var finTourTask = FinTourTask();
|
||||||
finTourTask.sId = taskInfo.task.sId;
|
finTourTask.sId = taskInfo.task.sId;
|
||||||
finTourTask.time = Util.toUnixMillisUtc(DateTime.now().toUtc());
|
finTourTask.time = Util.nowUnixSecondsUtc();
|
||||||
if (position != null) {
|
if (position != null) {
|
||||||
finTourTask.pos = FinTaskPos();
|
finTourTask.pos = FinTaskPos();
|
||||||
finTourTask.pos!.time = Util.toUnixMillisUtc(position.timestamp);
|
finTourTask.pos!.time = Util.toUnixSecondsUtc(position.timestamp);
|
||||||
finTourTask.pos!.lat = position.latitude;
|
finTourTask.pos!.lat = position.latitude;
|
||||||
finTourTask.pos!.long = position.longitude;
|
finTourTask.pos!.long = position.longitude;
|
||||||
finTourTask.pos!.acc = position.accuracy.toInt();
|
finTourTask.pos!.acc = position.accuracy.toInt();
|
||||||
@@ -534,7 +534,7 @@ class _TaskListPageState extends State<TaskListPage> with ProducerMixin {
|
|||||||
var position = await MyApp.getCurrentPosition();
|
var position = await MyApp.getCurrentPosition();
|
||||||
if (position != null) {
|
if (position != null) {
|
||||||
finTourMessage.track = Track();
|
finTourMessage.track = Track();
|
||||||
finTourMessage.track!.time = Util.toUnixMillisUtc(DateTime.now().toUtc());
|
finTourMessage.track!.time = Util.nowUnixSecondsUtc();
|
||||||
finTourMessage.track!.pos = FinTaskPos();
|
finTourMessage.track!.pos = FinTaskPos();
|
||||||
finTourMessage.track!.pos!.lat = position.latitude;
|
finTourMessage.track!.pos!.lat = position.latitude;
|
||||||
finTourMessage.track!.pos!.long = position.longitude;
|
finTourMessage.track!.pos!.long = position.longitude;
|
||||||
|
|||||||
@@ -375,7 +375,7 @@ _sendAnswer(SharedMapReference mapReference, Job job, int item) async {
|
|||||||
message.ver = job.ver.toString();
|
message.ver = job.ver.toString();
|
||||||
message.item = item;
|
message.item = item;
|
||||||
message.track = Track();
|
message.track = Track();
|
||||||
message.track.time = Util.toUnixMillisUtc(DateTime.now().toUtc());
|
message.track.time = Util.nowUnixSecondsUtc();
|
||||||
message.track.pos = FinTaskPos();
|
message.track.pos = FinTaskPos();
|
||||||
message.track.pos!.lat = currentPosition != null ? currentPosition.latitude : 0.0;
|
message.track.pos!.lat = currentPosition != null ? currentPosition.latitude : 0.0;
|
||||||
message.track.pos!.long = currentPosition != null ? currentPosition.longitude : 0.0;
|
message.track.pos!.long = currentPosition != null ? currentPosition.longitude : 0.0;
|
||||||
|
|||||||
@@ -595,7 +595,7 @@ class MqttCore with ProducerMixin, ConsumerMixin {
|
|||||||
answer.utcUnixTime = DateTime.now().toUtc().millisecondsSinceEpoch ~/ 1000;
|
answer.utcUnixTime = DateTime.now().toUtc().millisecondsSinceEpoch ~/ 1000;
|
||||||
|
|
||||||
answer.pos = SyncMessagePos();
|
answer.pos = SyncMessagePos();
|
||||||
answer.pos!.time = currentPosition != null ? Util.toUnixMillisUtc(currentPosition.timestamp.toUtc()) : 0;
|
answer.pos!.time = currentPosition != null ? Util.toUnixSecondsUtc(currentPosition.timestamp.toUtc()) : 0;
|
||||||
answer.pos!.lat = currentPosition != null ? currentPosition.latitude : 0.0;
|
answer.pos!.lat = currentPosition != null ? currentPosition.latitude : 0.0;
|
||||||
answer.pos!.long = currentPosition != null ? currentPosition.longitude : 0.0;
|
answer.pos!.long = currentPosition != null ? currentPosition.longitude : 0.0;
|
||||||
answer.pos!.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0;
|
answer.pos!.acc = currentPosition != null ? currentPosition.accuracy.toInt() : 0;
|
||||||
@@ -622,7 +622,7 @@ class MqttCore with ProducerMixin, ConsumerMixin {
|
|||||||
var trackMessage = TrackPosition();
|
var trackMessage = TrackPosition();
|
||||||
|
|
||||||
if (position != null) {
|
if (position != null) {
|
||||||
trackMessage.time = Util.toUnixMillisUtc(position.timestamp);
|
trackMessage.time = Util.toUnixSecondsUtc(position.timestamp);
|
||||||
trackMessage.lat = position.latitude;
|
trackMessage.lat = position.latitude;
|
||||||
trackMessage.long = position.longitude;
|
trackMessage.long = position.longitude;
|
||||||
trackMessage.acc = position.accuracy.toInt();
|
trackMessage.acc = position.accuracy.toInt();
|
||||||
|
|||||||
+1
-4
@@ -18,10 +18,7 @@ import '../Tools/colored_safe_area.dart';
|
|||||||
class Util {
|
class Util {
|
||||||
static late SharedPreferences prefs;
|
static late SharedPreferences prefs;
|
||||||
|
|
||||||
// DateTime → UTC Unix timestamps
|
static int nowUnixSecondsUtc() => DateTime.now().toUtc().millisecondsSinceEpoch ~/ 1000;
|
||||||
static int toUnixMillisUtc(DateTime dt) => dt.toUtc().millisecondsSinceEpoch;
|
|
||||||
static int nowUnixMillisUtc() => DateTime.now().toUtc().millisecondsSinceEpoch;
|
|
||||||
// Optional: Unix seconds
|
|
||||||
static int toUnixSecondsUtc(DateTime dt) => dt.toUtc().millisecondsSinceEpoch ~/ 1000;
|
static int toUnixSecondsUtc(DateTime dt) => dt.toUtc().millisecondsSinceEpoch ~/ 1000;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user