shark/hexapod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean

Browse Source
This commit is contained in:
Zhengyu Peng 2022-02-24 09:30:59 -05:00
parent 3daa95c276
commit 36d9080fc9
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
software/android/app/src/main/java/com/rookiedev/hexapod/DeviceListActivity.kt
View File

@ -2,6 +2,7 @@ package com.rookiedev.hexapod
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import android.bluetooth.BluetoothAdapter
import android.bluetooth.BluetoothDevice import android.bluetooth.BluetoothDevice
import android.bluetooth.BluetoothManager import android.bluetooth.BluetoothManager
import android.content.Context import android.content.Context
@ -57,11 +58,10 @@ class DeviceAdapter(mContext: Context?, private val devices: ArrayList<Bluetooth
class DeviceListActivity : Activity() { class DeviceListActivity : Activity() {
/**
* Member fields
*/
private var mContext: Context? = null private var mContext: Context? = null
private var bluetoothManager: BluetoothManager? = null private var bluetoothManager: BluetoothManager? = null
private var bluetoothAdapter: BluetoothAdapter? = null
@SuppressLint("MissingPermission") @SuppressLint("MissingPermission")
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@ -75,20 +75,17 @@ class DeviceListActivity : Activity() {
setResult(RESULT_CANCELED) setResult(RESULT_CANCELED)
// Get the local Bluetooth adapter // Get the local Bluetooth adapter
bluetoothManager = this.bluetoothManager = this.mContext!!.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
mContext!!.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager this.bluetoothAdapter = this.bluetoothManager!!.adapter
bluetoothManager!!.adapter
// Get a set of currently paired devices // Get a set of currently paired devices
val pairedDevices: Set<BluetoothDevice> = bluetoothManager!!.adapter.bondedDevices val pairedDevices: Set<BluetoothDevice> = bluetoothAdapter!!.bondedDevices
val deviceList: ArrayList<BluetoothDevice> = ArrayList(pairedDevices) val deviceList: ArrayList<BluetoothDevice> = ArrayList(pairedDevices)
val deviceAdapter = DeviceAdapter(this, deviceList)
val bluetoothAdapter = DeviceAdapter(this, deviceList)
// Find and set up the ListView for paired devices // Find and set up the ListView for paired devices
val pairedListView: ListView = findViewById<ListView>(R.id.paired_devices) val pairedListView: ListView = findViewById(R.id.paired_devices)
pairedListView.adapter = bluetoothAdapter pairedListView.adapter = deviceAdapter
pairedListView.onItemClickListener = mDeviceClickListener pairedListView.onItemClickListener = mDeviceClickListener
val cancelPicker = findViewById<TextView>(R.id.cancel_picker) val cancelPicker = findViewById<TextView>(R.id.cancel_picker)
@ -119,11 +116,6 @@ class DeviceListActivity : Activity() {
companion object { companion object {
/**
* Tag for Log
*/
private const val TAG = "DeviceListActivity"
/** /**
* Return Intent extra * Return Intent extra
*/ */