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

check bluetooth enabled

Browse Source
This commit is contained in:
Zhengyu Peng 2022-02-24 10:07:50 -05:00
parent 22a375a2ee
commit 12798c8588
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
software/android/app/src/main/java/com/rookiedev/hexapod/MainActivity.kt
View File

@ -124,7 +124,6 @@ class MainActivity : AppCompatActivity() {
if (bluetoothAdapter != null) { if (bluetoothAdapter != null) {
if (!bluetoothAdapter.isEnabled) { if (!bluetoothAdapter.isEnabled) {
alertDialog(ERROR_BLUETOOTH_DISABLED) alertDialog(ERROR_BLUETOOTH_DISABLED)
}
} else { } else {
if (btConnectPermission && btScanPermission) { if (btConnectPermission && btScanPermission) {
val serverIntent = Intent(this, DeviceListActivity::class.java) val serverIntent = Intent(this, DeviceListActivity::class.java)
@ -134,6 +133,7 @@ class MainActivity : AppCompatActivity() {
} }
} }
} }
}
if (tabLayout.selectedTabPosition == 0) { if (tabLayout.selectedTabPosition == 0) {
ipLayout.visibility = View.VISIBLE ipLayout.visibility = View.VISIBLE
@ -176,7 +176,6 @@ class MainActivity : AppCompatActivity() {
if (bluetoothAdapter != null) { if (bluetoothAdapter != null) {
if (!bluetoothAdapter.isEnabled) { if (!bluetoothAdapter.isEnabled) {
alertDialog(ERROR_BLUETOOTH_DISABLED) alertDialog(ERROR_BLUETOOTH_DISABLED)
}
} else { } else {
if (btConnectPermission && btScanPermission) { if (btConnectPermission && btScanPermission) {
saveSharedPref() saveSharedPref()
@ -189,6 +188,7 @@ class MainActivity : AppCompatActivity() {
alertDialog(ERROR_NO_PERMISSION) alertDialog(ERROR_NO_PERMISSION)
} }
} }
}
} else { } else {
alertDialog(ERROR_NO_DEVICE) alertDialog(ERROR_NO_DEVICE)
} }
@ -242,7 +242,6 @@ class MainActivity : AppCompatActivity() {
} else if (requestCode == BLUETOOTH_SCAN_CODE) { } else if (requestCode == BLUETOOTH_SCAN_CODE) {
btScanPermission = true btScanPermission = true
} }
} }
} }