Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes to be compatible to TLMReaderLib #24

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Changes to be compatible to TLMReaderLib #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
09ab218
call tlmReader with inputstream to reduce memory usage during parsing…
david-0 Jan 28, 2016
abeb715
Change to the new API calls decodeFlight,decodeFlightDefintions
david-0 Jan 29, 2016
ac28904
increase Performance, reduce memory usage (changes from TLMReader)
david-0 Feb 11, 2016
167f231
Fix: bottom line in legend is not visible
david-0 Feb 11, 2016
54680ab
Fix bug: Increased number of dataseries after every switch of the series
david-0 Feb 11, 2016
401422d
Label changed
david-0 Feb 11, 2016
0a71ece
rename methods
david-0 Feb 13, 2016
45766b8
change min value in chart for temperature
david-0 Feb 13, 2016
53f033a
New version of the tlmReaderLib
david-0 Feb 13, 2016
454edad
add new tlmreader.jar, do not add datapoint, if the value is invalid
david-0 Mar 3, 2016
fb3d5cb
add new TLMReaderLib.jar
david-0 Mar 10, 2016
3083522
add my email address
david-0 Mar 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
265 changes: 136 additions & 129 deletions plugins/com.monstarmike.telemetry.plugins.tlmDecoder/src/android/ExportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,142 +1,149 @@
package com.monstarmike.telemetry.plugins.tlmDecoder;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;

import org.json.JSONException;
import org.json.JSONObject;

import com.monstarmike.tlmreader.Flight;
import com.monstarmike.tlmreader.IFlight;
import com.monstarmike.tlmreader.TLMReader;

import android.app.IntentService;
import android.content.Intent;
import android.net.Uri;
import android.support.v4.content.LocalBroadcastManager;
import android.util.Log;

import com.google.common.io.ByteStreams;
import com.monstarmike.tlmreader.TLMReader;

import org.json.JSONObject;

import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;

/**
* Created by mgardner on 6/5/15.
*/
public class ExportService extends IntentService {
private static final String TAG = "ExportService";

public ExportService() {
super(TAG);
}

@Override
protected void onHandleIntent(Intent intent) {
String action = intent.getAction();

Log.d(TAG, "Export Service action: " + action);
if (action.equalsIgnoreCase(Constants.ExportServiceActions.READ_FLIGHT)) {
Uri fileUri = ServiceDataTransfer.getInstance().get_fileUri();
JSONObject flightJO = ServiceDataTransfer.getInstance().get_flight();

if (fileUri == null) {
Log.w(TAG, "The file Uri pulled from the ServiceDataTransfer singleton was null!");
}
if (flightJO == null) {
Log.w(TAG, "The flight object pulled from the ServiceDataTransfer singleton was null!");
}

JSONObject decodedFlight = null;
try {
decodedFlight = this.buildFlight(fileUri, flightJO);
} catch (Exception e) {
Log.e(TAG, "Error occurred decoding the flight!", e);
}

if (decodedFlight == null) {
Log.w(TAG, "The decoded flight was null. This could be seriously not good!");
}

ServiceDataTransfer.getInstance().set_flight(decodedFlight);

Intent localIntent = new Intent(Constants.READ_FLIGHT_BROADCAST_ACTION);
LocalBroadcastManager.getInstance(this).sendBroadcast(localIntent);
} else if (action.equalsIgnoreCase(Constants.ExportServiceActions.READ_FILE)) {
Uri uri = intent.getData();

Log.d(TAG, "Reading file: " + uri.toString());

JSONObject file = null;

try {
file = this.parseFile(uri);
} catch (IOException e) {
Log.e(TAG, "IO error when trying to get and parse the TLM data file.", e);
}

if (file == null) {
Log.w(TAG, "This is interesting. The file JSONObject from the parse function is null!");
}

Log.d(TAG, "Done with the file. Broadcasting a local intent.");
ServiceDataTransfer.getInstance().set_file(file);
Intent localIntent = new Intent(Constants.READ_FILE_BROADCAST_ACTION);
LocalBroadcastManager.getInstance(this).sendBroadcast(localIntent);
}
}

private JSONObject buildFlight(Uri uri, JSONObject flightJO) {

if (uri == null) {
Log.w(TAG, "Returning the default flight object that was passed in.");
return flightJO;
} else {
Log.d(TAG, "URI: " + uri.toString());
}

InputStream inputStream = null;
try {
inputStream = this.getContentResolver().openInputStream(uri);
} catch (FileNotFoundException e) {
Log.w(TAG, "Cannot find the file at " + uri.toString(), e);
}
if (inputStream == null) {
Log.w(TAG, "Returning the default flight object that was passed in.");
return flightJO;
}

byte[] bytes = new byte[0];
try {
bytes = ByteStreams.toByteArray(inputStream);
} catch (IOException e) {
Log.w(TAG, "Unable to read the input stream to a byte array.", e);
}

if (bytes.length == 0) {
Log.w(TAG, "Returning the default flight object that was passed in.");
return flightJO;
}

TLMReader reader = new TLMReader();

reader.Read(bytes);

Exporter exporter = new Exporter(uri, reader, this.getApplicationContext());
return exporter.exportFlightData(flightJO);
}

private JSONObject parseFile(Uri uri) throws IOException {
InputStream inputStream = this.getApplicationContext().getContentResolver().openInputStream(uri);
Log.d(TAG, "Have an input stream.");
byte[] bytes = ByteStreams.toByteArray(inputStream);
Log.d(TAG, "Read bytes: " + bytes.length);

TLMReader reader = new TLMReader();

reader.Read(bytes);

Log.d(TAG, "The reader has read all the bytes. Going to export.");

Exporter exporter = new Exporter(uri, reader, this.getApplicationContext());

JSONObject file = exporter.exportFlights();


return file;
}
private static final String TAG = "ExportService";

public ExportService() {
super(TAG);
}

@Override
protected void onHandleIntent(Intent intent) {
String action = intent.getAction();

Log.d(TAG, "Export Service action: " + action);
if (action.equalsIgnoreCase(Constants.ExportServiceActions.READ_FLIGHT)) {
Uri fileUri = ServiceDataTransfer.getInstance().get_fileUri();
JSONObject flightJO = ServiceDataTransfer.getInstance().get_flight();

if (fileUri == null) {
Log.w(TAG, "The file Uri pulled from the ServiceDataTransfer singleton was null!");
}
if (flightJO == null) {
Log.w(TAG, "The flight object pulled from the ServiceDataTransfer singleton was null!");
}

JSONObject decodedFlight = null;
try {
decodedFlight = this.decodeFlight(fileUri, flightJO);
} catch (Exception e) {
Log.e(TAG, "Error occurred decoding the flight!", e);
}

if (decodedFlight == null) {
Log.w(TAG, "The decoded flight was null. This could be seriously not good!");
}

ServiceDataTransfer.getInstance().set_flight(decodedFlight);

Intent localIntent = new Intent(Constants.READ_FLIGHT_BROADCAST_ACTION);
LocalBroadcastManager.getInstance(this).sendBroadcast(localIntent);
} else if (action.equalsIgnoreCase(Constants.ExportServiceActions.READ_FILE)) {
Uri uri = intent.getData();

Log.d(TAG, "Reading file: " + uri.toString());

JSONObject file = null;

try {
file = this.decodeFlightDefinitions(uri);
} catch (IOException e) {
Log.e(TAG, "IO error when trying to get and parse the TLM data file.", e);
}

if (file == null) {
Log.w(TAG, "This is interesting. The file JSONObject from the parse function is null!");
}

Log.d(TAG, "Done with the file. Broadcasting a local intent.");
ServiceDataTransfer.getInstance().set_file(file);
Intent localIntent = new Intent(Constants.READ_FILE_BROADCAST_ACTION);
LocalBroadcastManager.getInstance(this).sendBroadcast(localIntent);
}
}

private JSONObject decodeFlight(Uri uri, JSONObject flightJO) throws IOException {

if (uri == null) {
Log.w(TAG, "Returning the default flight object that was passed in.");
return flightJO;
} else {
Log.d(TAG, "URI: " + uri.toString());
}

InputStream inputStream = null;
try {
inputStream = this.getContentResolver().openInputStream(uri);
} catch (FileNotFoundException e) {
Log.w(TAG, "Cannot find the file at " + uri.toString(), e);
}
if (inputStream == null) {
Log.w(TAG, "Returning the default flight object that was passed in.");
return flightJO;
}

int joId = 0;
try {
joId = flightJO.getInt("_id");
Log.d(TAG, "FlightId: " + joId);
} catch (JSONException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

final TLMReader reader = new TLMReader();
final Flight flight = reader.parseFlight(inputStream, joId);

Exporter exporter = new Exporter(uri, this.getApplicationContext());
Log.d(TAG, "Found flight. Going to do a full decode.");
JSONObject exportFlightData = exporter.exportFlightData(flight);
Log.d(TAG, "Full decode done");
if (exportFlightData != null) {
try {
exportFlightData.put("_id", joId);
} catch (JSONException e) {
e.printStackTrace();
}
}
return exportFlightData;

}

private JSONObject decodeFlightDefinitions(Uri uri) throws IOException {
InputStream inputStream = this.getApplicationContext().getContentResolver().openInputStream(uri);
Log.d(TAG, "Instantiate TLMReader.");
List<IFlight> flights = new ArrayList<IFlight>();
final TLMReader reader = new TLMReader();
try {
flights = reader.parseFlightDefinitions(inputStream);
} catch (final IOException e) {
Log.w(TAG, "Unable to read the input stream.", e);
}
Log.d(TAG, "Read bytes: " + reader.getNumberOfBytesRead());
Exporter exporter = new Exporter(uri, this.getApplicationContext());
JSONObject file = exporter.exportFlightDefintions(flights);
return file;
}
}
Loading