zhaoyadi 8 mēneši atpakaļ
vecāks
revīzija
4746e006a3

+ 6 - 1
xiaodou/src/main/java/com/luojigou/xiaodou/XDScanBLEService.kt

@@ -13,6 +13,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationChannelCompat
@@ -159,7 +160,11 @@ class XDScanBLEService : Service() {
         val intentFilter = IntentFilter()
         intentFilter.addAction(ACTION_START_SCAN)
         intentFilter.addAction(ACTION_STOP_SCAN)
-        registerReceiver(bluetoothReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED)
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            registerReceiver(bluetoothReceiver, intentFilter, Context.RECEIVER_NOT_EXPORTED)
+        }else{
+            registerReceiver(bluetoothReceiver, intentFilter)
+        }
 
         startScan()
     }

+ 14 - 7
xiaodou/src/main/java/com/luojigou/xiaodou/ble/XDScanBLENormalFragment.kt

@@ -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(