dinislage/Bluetooth-LE-Library-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Working on the list UI

Browse Source
This commit is contained in:
Alexandros Schillings
2014-03-12 23:49:42 +00:00
parent e21d05a9e0
commit f5b9d5e674
3 changed files with 110 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
sample_app/res/layout/list_item_device.xml
View File

@@ -38,16 +38,16 @@
android:layout_height="wrap_content"
android:textSize="24sp" />
<LinearLayout
<GridLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" >
android:columnCount="4" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:text="MAC:"
android:text="@string/label_mac"
android:textSize="12sp" />
<TextView
@@ -57,17 +57,11 @@
android:textSize="12sp"
android:typeface="monospace" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" - "
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:text="RSSI:"
android:text="@string/label_rssi"
android:textSize="12sp" />
<TextView
@@ -76,7 +70,85 @@
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:textSize="12sp" />
</LinearLayout>
</GridLayout>
<GridLayout
android:id="@+id/ibeacon_section"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:columnCount="4" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:text="@string/label_uuid"
android:textSize="12sp" />
<TextView
android:id="@+id/ibeacon_uuid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_columnSpan="3"
android:paddingRight="5dp"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:text="@string/label_major"
android:textSize="12sp" />
<TextView
android:id="@+id/ibeacon_major"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:text="@string/label_minor"
android:textSize="12sp" />
<TextView
android:id="@+id/ibeacon_minor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:text="@string/label_tx_power"
android:textSize="12sp" />
<TextView
android:id="@+id/ibeacon_tx_power"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:textSize="12sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:text="@string/label_distance"
android:textSize="12sp" />
<TextView
android:id="@+id/ibeacon_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="5dp"
android:textSize="12sp" />
</GridLayout>
</LinearLayout>
</LinearLayout>

7
sample_app/res/values/strings.xml
View File

@@ -16,5 +16,12 @@
<string name="menu_disconnect">Disconnect</string>
<string name="menu_scan">Scan</string>
<string name="menu_stop">Stop</string>
<string name="label_distance">Distance:</string>
<string name="label_tx_power">TX Power:</string>
<string name="label_minor">Minor:</string>
<string name="label_major">Major:</string>
<string name="label_uuid">UUID:</string>
<string name="label_rssi">RSSI:</string>
<string name="label_mac">MAC:</string>
</resources>

20
sample_app/src/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java
View File

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import uk.co.alt236.bluetoothlelib.device.BluetoothLeDevice;
import uk.co.alt236.bluetoothlelib.device.mfdata.IBeaconManufacturerData;
import uk.co.alt236.bluetoothlelib.util.IBeaconUtils;
import uk.co.alt236.btlescan.R;
import android.app.Activity;
@@ -67,6 +68,12 @@ import android.widget.TextView;
viewHolder.deviceName = (TextView) view.findViewById(R.id.device_name);
viewHolder.deviceRssi = (TextView) view.findViewById(R.id.device_rssi);
viewHolder.deviceIcon = (ImageView) view.findViewById(R.id.device_icon);
viewHolder.ibeaconMajor = (TextView) view.findViewById(R.id.ibeacon_major);
viewHolder.ibeaconMinor = (TextView) view.findViewById(R.id.ibeacon_minor);
viewHolder.ibeaconDistance = (TextView) view.findViewById(R.id.ibeacon_distance);
viewHolder.ibeaconUUID = (TextView) view.findViewById(R.id.ibeacon_uuid);
viewHolder.ibeaconTxPower = (TextView) view.findViewById(R.id.ibeacon_tx_power);
viewHolder.ibeaconSection = (View) view.findViewById(R.id.ibeacon_section);
view.setTag(viewHolder);
} else {
viewHolder = (ViewHolder) view.getTag();
@@ -82,9 +89,16 @@ import android.widget.TextView;
}
if (IBeaconUtils.isThisAnIBeacon(device)){
final IBeaconManufacturerData data = new IBeaconManufacturerData(device);
viewHolder.deviceIcon.setImageResource(R.drawable.ic_device_ibeacon);
viewHolder.ibeaconSection.setVisibility(View.VISIBLE);
viewHolder.ibeaconMajor.setText(String.valueOf(data.getMajor()));
viewHolder.ibeaconMinor.setText(String.valueOf(data.getMinor()));
viewHolder.ibeaconTxPower.setText(String.valueOf(data.getCalibratedTxPower()));
viewHolder.ibeaconUUID.setText(data.getUUID().toString());
} else {
viewHolder.deviceIcon.setImageResource(R.drawable.ic_bluetooth);
viewHolder.ibeaconSection.setVisibility(View.GONE);
}
viewHolder.deviceAddress.setText(device.getAddress());
@@ -96,6 +110,12 @@ import android.widget.TextView;
TextView deviceName;
TextView deviceAddress;
TextView deviceRssi;
TextView ibeaconUUID;
TextView ibeaconMajor;
TextView ibeaconMinor;
TextView ibeaconTxPower;
TextView ibeaconDistance;
View ibeaconSection;
ImageView deviceIcon;
}