|
@@ -2,10 +2,10 @@ package com.luojigou.xiaodou.ble
|
|
|
|
|
|
import android.annotation.SuppressLint
|
|
|
import android.content.BroadcastReceiver
|
|
|
-import android.content.ComponentName
|
|
|
import android.content.Context
|
|
|
import android.content.Intent
|
|
|
import android.content.IntentFilter
|
|
|
+import android.os.Build
|
|
|
import android.os.Bundle
|
|
|
import android.view.LayoutInflater
|
|
|
import android.view.View
|
|
@@ -17,7 +17,6 @@ import androidx.fragment.app.Fragment
|
|
|
import androidx.recyclerview.widget.GridLayoutManager
|
|
|
import androidx.recyclerview.widget.RecyclerView
|
|
|
import com.luojigou.xiaodou.R
|
|
|
-import com.luojigou.xiaodou.XDScanBLEActivity
|
|
|
import com.luojigou.xiaodou.XDScanBLEService
|
|
|
import com.luojigou.xiaodou.XDScanBLEService.Companion.ACTION_SCAN_RESULT
|
|
|
import com.luojigou.xiaodou.XDScanBLEService.Companion.ACTION_SCAN_RESULT_DATA
|
|
@@ -83,11 +82,19 @@ class XDScanBLENormalFragment(private val host: XDScanBLEStatus.Host) : Fragment
|
|
|
|
|
|
val intentFilter = IntentFilter()
|
|
|
intentFilter.addAction(ACTION_SCAN_RESULT)
|
|
|
- requireContext().registerReceiver(
|
|
|
- bluetoothReceiver,
|
|
|
- intentFilter,
|
|
|
- Context.RECEIVER_NOT_EXPORTED
|
|
|
- )
|
|
|
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
|
|
+ requireContext().registerReceiver(
|
|
|
+ bluetoothReceiver,
|
|
|
+ intentFilter,
|
|
|
+ Context.RECEIVER_NOT_EXPORTED
|
|
|
+ )
|
|
|
+ } else {
|
|
|
+ requireContext().registerReceiver(
|
|
|
+ bluetoothReceiver,
|
|
|
+ intentFilter,
|
|
|
+ )
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
requireContext().startForegroundService(
|
|
|
Intent(
|