diff --git a/sample_app/AndroidManifest.xml b/sample_app/AndroidManifest.xml index 72924ee..216ec6c 100644 --- a/sample_app/AndroidManifest.xml +++ b/sample_app/AndroidManifest.xml @@ -30,7 +30,7 @@ diff --git a/sample_app/src/uk/co/alt236/btlescan/activities/DetailsActivity.java b/sample_app/src/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java similarity index 94% rename from sample_app/src/uk/co/alt236/btlescan/activities/DetailsActivity.java rename to sample_app/src/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java index 99dd2fd..2581279 100644 --- a/sample_app/src/uk/co/alt236/btlescan/activities/DetailsActivity.java +++ b/sample_app/src/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java @@ -19,7 +19,7 @@ import android.widget.TextView; import butterknife.ButterKnife; import butterknife.InjectView; -public class DetailsActivity extends Activity{ +public class DeviceDetailsActivity extends Activity{ private static final String SECTION_LINE = "------------------------------"; public static final String EXTRA_DEVICE = "extra_device"; @@ -79,6 +79,8 @@ public class DetailsActivity extends Activity{ if(device == null){ append(sb, "Invalid Device Data!", null); } else { + append(sb, "Device Info", null); + append(sb, SECTION_LINE, null); append(sb, "Device Name", device.getName()); append(sb, "Device Address", device.getAddress()); @@ -110,7 +112,8 @@ public class DetailsActivity extends Activity{ for(final AdRecord record : adRecords){ append(sb, "#" +record.getType() + " " + record.getHumanReadableType(), null); - append(sb, AdRecordUtils.getRecordDataAsString(record), null); + append(sb, " As String: '" + AdRecordUtils.getRecordDataAsString(record) + "'", null); + append(sb, " As Array : " + ByteUtils.byteArrayToHexString(record.getData()), null); append(sb, "", null); } diff --git a/sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java b/sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java index 407ab2d..0e7e039 100644 --- a/sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java +++ b/sample_app/src/uk/co/alt236/btlescan/activities/MainActivity.java @@ -50,8 +50,8 @@ public class MainActivity extends ListActivity { if (device == null) return; - final Intent intent = new Intent(this, DetailsActivity.class); - intent.putExtra(DetailsActivity.EXTRA_DEVICE, device); + final Intent intent = new Intent(this, DeviceDetailsActivity.class); + intent.putExtra(DeviceDetailsActivity.EXTRA_DEVICE, device); startActivity(intent); }