Finalising before merging
This commit is contained in:
Alexandros Schillings
@@ -1,19 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest
|
||||
package="uk.co.alt236.bluetoothlelib"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:versionCode="2"
|
||||
android:versionName="0.0.2">
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="18"
|
||||
android:targetSdkVersion="18"/>
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
android:icon="@drawable/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/AppTheme">
|
||||
</application>
|
||||
package="uk.co.alt236.bluetoothlelib">
|
||||
|
||||
</manifest>
|
||||
@@ -9,7 +9,7 @@ import java.util.Arrays;
|
||||
/**
|
||||
* Created by Dave Smith
|
||||
* Double Encore, Inc.
|
||||
* <p/>
|
||||
* <p>
|
||||
* Expanded by Alexandros Schillings
|
||||
*/
|
||||
public final class AdRecord implements Parcelable {
|
||||
@@ -34,9 +34,9 @@ public final class AdRecord implements Parcelable {
|
||||
|
||||
/**
|
||||
* General FLAGS
|
||||
* <p/>
|
||||
* <p>
|
||||
* Description: Flags
|
||||
* <p/>
|
||||
* <p>
|
||||
* Information:
|
||||
* Bit 0: LE Limited Discoverable Mode
|
||||
* Bit 1: LE General Discoverable Mode
|
||||
|
||||
+7
-8
@@ -10,10 +10,11 @@ import uk.co.alt236.bluetoothlelib.util.ByteUtils;
|
||||
|
||||
/**
|
||||
* Parses the Manufactured Data field of an iBeacon
|
||||
* <p/>
|
||||
* The parsing is based on the following schema:
|
||||
* <p/>
|
||||
* <p>
|
||||
* The parsing is based on the following schema:
|
||||
* <pre>
|
||||
* Byte|Value
|
||||
* -------------------------------------------------
|
||||
* 0 4C - Byte 1 (LSB) of Company identifier code
|
||||
* 1 00 - Byte 0 (MSB) of Company identifier code (0x004C == Apple)
|
||||
* 2 02 - Byte 0 of iBeacon advertisement indicator
|
||||
@@ -25,8 +26,8 @@ import uk.co.alt236.bluetoothlelib.util.ByteUtils;
|
||||
* 8 df |###\\
|
||||
* 9 fb |####\\
|
||||
* 10 48 |#####\\
|
||||
* 11 d2 |#####|| iBeacon proximity UUID
|
||||
* 12 b0 |#####||
|
||||
* 11 d2 |#####|| iBeacon
|
||||
* 12 b0 |#####|| Proximity UUID
|
||||
* 13 60 |#####//
|
||||
* 14 d0 |####//
|
||||
* 15 f5 |###//
|
||||
@@ -39,9 +40,7 @@ import uk.co.alt236.bluetoothlelib.util.ByteUtils;
|
||||
* 22 00 - minor
|
||||
* 23 00
|
||||
* 24 c5 - The 2's complement of the calibrated Tx Power
|
||||
* <p/>
|
||||
* </p>
|
||||
*
|
||||
* </pre>
|
||||
* @author Alexandros Schillings
|
||||
*/
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import java.util.Map;
|
||||
|
||||
/**
|
||||
* The UUIDS have been collected from the following sources:
|
||||
* <p/>
|
||||
* <p>
|
||||
* - http://developer.nokia.com/community/wiki/Bluetooth_Services_for_Windows_Phone
|
||||
* - The Bluez project
|
||||
*
|
||||
|
||||
@@ -15,7 +15,7 @@ public class ByteUtils {
|
||||
|
||||
/**
|
||||
* Gets a pretty representation of a Byte Array as a HEX String.
|
||||
* <p/>
|
||||
* <p>
|
||||
* Sample output: [01, 30, FF, AA]
|
||||
*
|
||||
* @param array the array
|
||||
@@ -79,7 +79,7 @@ public class ByteUtils {
|
||||
|
||||
/**
|
||||
* Converts a byte to an int, preserving the sign.
|
||||
* <p/>
|
||||
* <p>
|
||||
* For example, FF will be converted to 255 and not -1.
|
||||
*
|
||||
* @param bite the byte
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.2 KiB |
@@ -1,11 +0,0 @@
|
||||
<resources>
|
||||
|
||||
<!--
|
||||
Base application theme for API 11+. This theme completely replaces
|
||||
AppBaseTheme from res/values/styles.xml on API 11+ devices.
|
||||
-->
|
||||
<style name="AppBaseTheme" parent="android:Theme.Holo.Light">
|
||||
<!-- API 11 theme customizations can go here. -->
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
@@ -1,12 +0,0 @@
|
||||
<resources>
|
||||
|
||||
<!--
|
||||
Base application theme for API 14+. This theme completely replaces
|
||||
AppBaseTheme from BOTH res/values/styles.xml and
|
||||
res/values-v11/styles.xml on API 14+ devices.
|
||||
-->
|
||||
<style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
|
||||
<!-- API 14 theme customizations can go here. -->
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
@@ -1,5 +0,0 @@
|
||||
<resources>
|
||||
|
||||
<string name="app_name">Bluetooth LE Library</string>
|
||||
|
||||
</resources>
|
||||
@@ -1,20 +0,0 @@
|
||||
<resources>
|
||||
|
||||
<!--
|
||||
Base application theme, dependent on API level. This theme is replaced
|
||||
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
|
||||
-->
|
||||
<style name="AppBaseTheme" parent="android:Theme.Light">
|
||||
<!--
|
||||
Theme customizations available in newer API levels can go in
|
||||
res/values-vXX/styles.xml, while customizations related to
|
||||
backward-compatibility can go here.
|
||||
-->
|
||||
</style>
|
||||
|
||||
<!-- Application theme. -->
|
||||
<style name="AppTheme" parent="AppBaseTheme">
|
||||
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
Reference in New Issue
Block a user