Commit 300bb4be authored by Lily Tsai's avatar Lily Tsai
Browse files

done

parents 3442598c 29bc9fa8
......@@ -7,7 +7,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.2'
classpath 'com.android.tools.build:gradle:3.1.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
classpath 'com.google.gms:google-services:3.2.0'
......
......@@ -34,9 +34,9 @@ android {
workingDir 'src/main/jni'
commandLine './ndk-build-script.sh'
}
tasks.withType(JavaCompile) {
compileTask -> compileTask.dependsOn buildNDK
}
//tasks.withType(JavaCompile) {
//compileTask -> compileTask.dependsOn buildNDK
//}
buildTypes {
debug {
signingConfig signingConfigs.debug
......
......@@ -186,9 +186,10 @@ public class ScannerProcessor {
// get the rssi
int rssi = result.getRssi();
// process the scan result. if this is a new device, pkid is not null
// TODO check
long pkid = SDDR_Native.c_processScanResult(rssi, newnonce,
System.currentTimeMillis() - SystemClock.elapsedRealtime() + result.getTimestampNanos() / 1000000);
System.currentTimeMillis() -
SystemClock.elapsedRealtime() +
result.getTimestampNanos() / 1000000);
Log.d(TAG, "Processing SDDR_API scanresult with data " + Utils.getHexString(datahead) + Utils.getHexString(datatail) + ":\n"
+ "newNonce " + Utils.getHexString(newnonce) + ", "
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment