From c5bf501d8b507d1e3e79541e7ac9b45910860b4d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 29 May 2019 16:17:07 +0800
Subject: [PATCH] 添加新功能
---
app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
index d534b49..977703d 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/BLESearchActivity.java
@@ -68,8 +68,11 @@
@Override
protected void onDestroy() {
super.onDestroy();
- if (mBluetoothService != null)
+ if (mBluetoothService != null) {
+ mBluetoothService.cancelScan();
unbindService();
+ }
+
EventMessage msg = new EventMessage();
msg.setType(AppConfig.SET_MAIN_CALL);
EventBus.getDefault().postSticky(msg);
@@ -278,12 +281,12 @@
}
private void checkPermissions() {
- if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+ if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
!= PackageManager.PERMISSION_GRANTED) {//���������������������
//������������������,200������������
- ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_FINE_LOCATION}, 200);
+ ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, 200);
} else {
- if (!isLocationEnable(this)){
+ if (!isLocationEnable(this)) {
Intent locationIntent = new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS);
this.startActivityForResult(locationIntent, 2);
}
--
Gitblit v1.8.0