-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## New Features * Implement Lora-Gateway-Data 1.1.0 Format ## Bugfixes ## Changes * Refactoring * Make requests.conf not needed anymore.
- Loading branch information
Showing
9 changed files
with
91 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,81 +1,32 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Globalization; | ||
| using System.Linq; | ||
| using LitJson; | ||
|
|
||
| namespace Fraunhofer.Fit.IoT.LoraMap.Model { | ||
| class AlarmItem { | ||
| public Double Rssi { get; private set; } | ||
| public Double Snr { get; private set; } | ||
| public DateTime Lorarecievedtime { get; private set; } | ||
| public DateTime Recievedtime { get; private set; } | ||
| public Double Latitude { get; private set; } | ||
| public Double Longitude { get; private set; } | ||
| public UTMData UTM { get; private set; } | ||
| public Double Hdop { get; private set; } | ||
| public Boolean Fix { get; private set; } | ||
| public Double Height { get; private set; } | ||
| public List<DateTime> ButtonPressed => this.buttonhistory.Keys.ToList(); | ||
|
|
||
| public class AlarmItem : PositionItem { | ||
| private readonly SortedDictionary<DateTime, String> buttonhistory = new SortedDictionary<DateTime, String>(); | ||
|
|
||
| public AlarmItem(JsonData json) => this.Update(json); | ||
| public List<DateTime> ButtonPressed => this.buttonhistory.Keys.ToList(); | ||
|
|
||
| public void Update(JsonData json) { | ||
| this.Rssi = json["Rssi"].IsInt ? (Int32)json["Rssi"] : (Double)json["Rssi"]; | ||
| this.Snr = json["Snr"].IsInt ? (Int32)json["Snr"] : (Double)json["Snr"]; | ||
| if (DateTime.TryParse((String)json["Receivedtime"], DateTimeFormatInfo.InvariantInfo, DateTimeStyles.AssumeUniversal, out DateTime updatetime)) { | ||
| this.Lorarecievedtime = updatetime.ToUniversalTime(); | ||
| } | ||
| this.Recievedtime = DateTime.UtcNow; | ||
| this.Latitude = json["Gps"]["Latitude"].IsInt ? (Int32)json["Gps"]["Latitude"] : (Double)json["Gps"]["Latitude"]; | ||
| this.Longitude = json["Gps"]["Longitude"].IsInt ? (Int32)json["Gps"]["Longitude"] : (Double)json["Gps"]["Longitude"]; | ||
| this.Fix = (Boolean)json["Gps"]["Fix"]; | ||
| if (!this.Fix) { | ||
| this.Latitude = json["Gps"]["LastLatitude"].IsInt ? (Int32)json["Gps"]["LastLatitude"] : (Double)json["Gps"]["LastLatitude"]; | ||
| this.Longitude = json["Gps"]["LastLongitude"].IsInt ? (Int32)json["Gps"]["LastLongitude"] : (Double)json["Gps"]["LastLongitude"]; | ||
| } | ||
| this.UTM = new UTMData(this.Latitude, this.Longitude); | ||
| this.Hdop = json["Gps"]["Hdop"].IsInt ? (Int32)json["Gps"]["Hdop"] : (Double)json["Gps"]["Hdop"]; | ||
| this.Height = json["Gps"]["Height"].IsInt ? (Int32)json["Gps"]["Height"] : (Double)json["Gps"]["Height"]; | ||
| public AlarmItem(JsonData json) : base(json, null) { | ||
| } | ||
|
|
||
| public override void Update(JsonData json) { | ||
| base.Update(json); | ||
| this.SetHistory(json); | ||
| } | ||
|
|
||
| private void SetHistory(JsonData json) { | ||
| String key = json["BatteryLevel"].ToString(); | ||
| key += "_" + json["Calculatedcrc"].ToString(); | ||
| key += "_" + json["Gps"]["Hdop"].ToString(); | ||
| key += "_" + json["Gps"]["Height"].ToString(); | ||
| key += "_" + json["Gps"]["Fix"].ToString(); | ||
| key += "_" + json["Gps"]["LastLatitude"].ToString(); | ||
| key += "_" + json["Gps"]["LastLongitude"].ToString(); | ||
| key += "_" + json["Gps"]["Time"].ToString(); | ||
| if(!this.buttonhistory.ContainsValue(key)) { | ||
| this.buttonhistory.Add(DateTime.UtcNow, key); | ||
| if(this.buttonhistory.Count > 10) { | ||
| this.buttonhistory.Remove(this.buttonhistory.Keys.ToList().First()); | ||
| if(json.ContainsKey("Hash") && json["Hash"].IsString) { | ||
| String key = json["Hash"].ToString(); | ||
| if(!this.buttonhistory.ContainsValue(key)) { | ||
| this.buttonhistory.Add(DateTime.UtcNow, key); | ||
| if(this.buttonhistory.Count > 10) { | ||
| _ = this.buttonhistory.Remove(this.buttonhistory.Keys.ToList().First()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public static String GetId(JsonData json) => (String)json["Name"]; | ||
|
|
||
| public static Boolean CheckJson(JsonData json) => | ||
| json.ContainsKey("Rssi") && (json["Rssi"].IsDouble || json["Rssi"].IsInt) | ||
| && json.ContainsKey("Snr") && (json["Snr"].IsDouble || json["Snr"].IsInt) | ||
| && json.ContainsKey("Receivedtime") && json["Receivedtime"].IsString | ||
| && json.ContainsKey("BatteryLevel") && (json["BatteryLevel"].IsDouble || json["BatteryLevel"].IsInt) | ||
| && json.ContainsKey("Gps") && json["Gps"].IsObject | ||
| && json["Gps"].ContainsKey("Latitude") && (json["Gps"]["Latitude"].IsDouble || json["Gps"]["Latitude"].IsInt) | ||
| && json["Gps"].ContainsKey("Longitude") && (json["Gps"]["Longitude"].IsDouble || json["Gps"]["Longitude"].IsInt) | ||
| && json["Gps"].ContainsKey("LastLatitude") && (json["Gps"]["LastLatitude"].IsDouble || json["Gps"]["LastLatitude"].IsInt) | ||
| && json["Gps"].ContainsKey("LastLongitude") && (json["Gps"]["LastLongitude"].IsDouble || json["Gps"]["LastLongitude"].IsInt) | ||
| && json["Gps"].ContainsKey("LastGPSPos") && json["Gps"]["LastGPSPos"].IsString | ||
| && json["Gps"].ContainsKey("Hdop") && (json["Gps"]["Hdop"].IsDouble || json["Gps"]["Hdop"].IsInt) | ||
| && json["Gps"].ContainsKey("Fix") && json["Gps"]["Fix"].IsBoolean | ||
| && json["Gps"].ContainsKey("Height") && (json["Gps"]["Height"].IsDouble || json["Gps"]["Height"].IsInt) | ||
| && json.ContainsKey("Name") && json["Name"].IsString && | ||
| json.ContainsKey("Calculatedcrc") && json["Calculatedcrc"].IsInt; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.