这是indexloc提供的服务，不要输入任何密码
Skip to content

Add limit option for SensorAPI #190

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

Merged
merged 1 commit into from
Jun 26, 2018
Merged

Add limit option for SensorAPI #190

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 23 additions & 3 deletions app/src/main/java/com/termux/api/SensorAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void onDestroy() {
TermuxApiLogger.info("SensorAPI SensorReaderService onDestroy()");
}

protected void cleanup() {
protected static void cleanup() {
if (outputWriter != null && outputWriter.isRunning()) {
outputWriter.interrupt();
outputWriter = null;
Expand Down Expand Up @@ -334,9 +334,15 @@ public void onError(Exception e) {
TermuxApiLogger.error("SensorOutputWriter error", e);
}
});
int delay = intent.getIntExtra("delay", 1000);

int delay = intent.getIntExtra("delay", SensorOutputWriter.DEFAULT_DELAY);
TermuxApiLogger.info("Delay set to: " + delay);
outputWriter.setDelay(delay);

int limit = intent.getIntExtra("limit", SensorOutputWriter.DEFAULT_LIMIT);
TermuxApiLogger.info("SensorOutput limit set to: " + limit);
outputWriter.setLimit(limit);

return outputWriter;
}

Expand All @@ -346,11 +352,15 @@ public void onError(Exception e) {
*/
static class SensorOutputWriter extends Thread {
// delay in milliseconds before posting new sensor reading
protected static final int DEFAULT_DELAY = 1000;
static final int DEFAULT_DELAY = 1000;

static final int DEFAULT_LIMIT = Integer.MAX_VALUE;

protected String outputSocketAddress;
protected boolean isRunning;
protected int delay;
protected int counter;
protected int limit;
protected SocketWriterErrorListener errorListener;


Expand All @@ -375,9 +385,14 @@ public void setDelay(int delay) {
this.delay = delay;
}

public void setLimit(int limit) {
this.limit = limit;
}

@Override
public void run() {
isRunning = true;
counter = 0;

try {
try (LocalSocket outputSocket = new LocalSocket()) {
Expand All @@ -395,6 +410,11 @@ public void run() {
writer.write(sensorReadout.toString(INDENTATION) + "\n");
writer.flush();
semaphore.release();

if (++counter >= limit) {
TermuxApiLogger.info("SensorOutput limit reached! Performing cleanup");
cleanup();
}
}
TermuxApiLogger.info("SensorOutputWriter finished");
}
Expand Down