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 36d9080fc9
commit dc5d349db6
1 changed files with 16 additions and 17 deletions
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.isEnabled) {
alertDialog(ERROR_BLUETOOTH_DISABLED)
}
} else {
if (btConnectPermission && btScanPermission) {
val serverIntent = Intent(this, DeviceListActivity::class.java)
@@ -134,6 +133,7 @@ class MainActivity : AppCompatActivity() {
}
}
}
}
if (tabLayout.selectedTabPosition == 0) {
ipLayout.visibility = View.VISIBLE
@@ -176,7 +176,6 @@ class MainActivity : AppCompatActivity() {
if (bluetoothAdapter != null) {
if (!bluetoothAdapter.isEnabled) {
alertDialog(ERROR_BLUETOOTH_DISABLED)
}
} else {
if (btConnectPermission && btScanPermission) {
saveSharedPref()
@@ -189,6 +188,7 @@ class MainActivity : AppCompatActivity() {
alertDialog(ERROR_NO_PERMISSION)
}
}
}
} else {
alertDialog(ERROR_NO_DEVICE)
}
@@ -242,7 +242,6 @@ class MainActivity : AppCompatActivity() {
} else if (requestCode == BLUETOOTH_SCAN_CODE) {
btScanPermission = true
}
}
}