Added Distance calculation but it is off.
This commit is contained in:
@@ -1,12 +1,10 @@
|
|||||||
package uk.co.alt236.bluetoothlelib.device.mfdata;
|
package uk.co.alt236.bluetoothlelib.device.mfdata;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
import uk.co.alt236.bluetoothlelib.device.BluetoothLeDevice;
|
import uk.co.alt236.bluetoothlelib.device.BluetoothLeDevice;
|
||||||
import uk.co.alt236.bluetoothlelib.device.adrecord.AdRecord;
|
import uk.co.alt236.bluetoothlelib.device.adrecord.AdRecord;
|
||||||
import uk.co.alt236.bluetoothlelib.util.ByteUtils;
|
import uk.co.alt236.bluetoothlelib.util.ByteUtils;
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Objectifies the Manufactured Data field of an iBeacon
|
* Objectifies the Manufactured Data field of an iBeacon
|
||||||
@@ -89,6 +87,10 @@ public final class IBeaconManufacturerData {
|
|||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public double getAccuracy(int rssi){
|
||||||
|
return calculateAccuracy(mCalibratedTxPower, rssi);
|
||||||
|
}
|
||||||
|
|
||||||
public int getCalibratedTxPower(){
|
public int getCalibratedTxPower(){
|
||||||
return mCalibratedTxPower;
|
return mCalibratedTxPower;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,6 +96,7 @@ import android.widget.TextView;
|
|||||||
viewHolder.ibeaconMinor.setText(String.valueOf(data.getMinor()));
|
viewHolder.ibeaconMinor.setText(String.valueOf(data.getMinor()));
|
||||||
viewHolder.ibeaconTxPower.setText(String.valueOf(data.getCalibratedTxPower()));
|
viewHolder.ibeaconTxPower.setText(String.valueOf(data.getCalibratedTxPower()));
|
||||||
viewHolder.ibeaconUUID.setText(data.getUUID());
|
viewHolder.ibeaconUUID.setText(data.getUUID());
|
||||||
|
viewHolder.ibeaconDistance.setText(String.valueOf(data.getAccuracy(device.getRssi())));
|
||||||
} else {
|
} else {
|
||||||
viewHolder.deviceIcon.setImageResource(R.drawable.ic_bluetooth);
|
viewHolder.deviceIcon.setImageResource(R.drawable.ic_bluetooth);
|
||||||
viewHolder.ibeaconSection.setVisibility(View.GONE);
|
viewHolder.ibeaconSection.setVisibility(View.GONE);
|
||||||
|
|||||||
Reference in New Issue
Block a user