权限申请前移

xiaodou/src/main/AndroidManifest.xml

@@ -43,11 +43,11 @@
             android:theme="@style/XDTheme" />
 
         <activity
-            android:name=".xiaodou.XDScanBLEActivity"
+            android:name=".ble.XDScanBLEActivity"
             android:theme="@style/XDTheme" />
 
         <activity
-            android:name=".xiaodou.XDScanWifiActivity"
+            android:name=".wifi.XDScanWifiActivity"
             android:theme="@style/XDTheme" />
 
         <activity

xiaodou/src/main/java/com/luojigou/product/ProductSelectActivity.kt

@@ -16,9 +16,8 @@ class ProductSelectActivity : BaseActivity() {
     private lateinit var productRecyclerView: RecyclerView
 
     private val productList = listOf(
-        ProductModel(0, "小逗AI学习机", MaterialDrawable.ic_clock_black_24dp),
-        ProductModel(1, "中逗AI学习机", MaterialDrawable.ic_keyboard_black_24dp),
-        ProductModel(2, "大逗AI学习机", MaterialDrawable.material_ic_calendar_black_24dp),
+        ProductModel(0, "小逗AI思维机", MaterialDrawable.ic_clock_black_24dp),
+        ProductModel(1, "智能指读学习机", MaterialDrawable.ic_keyboard_black_24dp),
     )
 
     override fun onCreate(savedInstanceState: android.os.Bundle?) {
@@ -33,9 +32,6 @@ class ProductSelectActivity : BaseActivity() {
                 0 -> startActivity(Intent(this, XDIntroduceActivity::class.java))
                 1 -> { // TODO: 跳转到中逗AI学习机
                 }
-
-                2 -> { // TODO: 跳转到大逗AI学习机
-                }
             }
         }
         productLayoutManager = GridLayoutManager(this, 2)

xiaodou/src/main/java/com/luojigou/product/base/AbsIntroduceActivity.kt

@@ -1,27 +0,0 @@
-package com.luojigou.product.base
-
-import android.view.View
-import android.widget.Button
-import com.luojigou.product.R
-
-abstract class AbsIntroduceActivity : BaseActivity(), View.OnClickListener {
-
-    private lateinit var buttonStart: Button
-
-    override fun onCreate(savedInstanceState: android.os.Bundle?) {
-        super.onCreate(savedInstanceState)
-        setTitle("连接引导")
-        buttonStart = findViewById(R.id.btn_intro_start)
-        buttonStart.setOnClickListener(this)
-    }
-
-    override fun getLayoutId(): Int = R.layout.activity_xd_introduce
-
-    override fun onClick(v: View?) {
-        when (v?.id) {
-            R.id.btn_intro_start -> startActivity()
-        }
-    }
-
-    abstract fun startActivity()
-}

xiaodou/src/main/java/com/luojigou/product/base/BaseActivity.kt

@@ -9,6 +9,8 @@ import android.os.Bundle
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import com.luojigou.product.R
 import com.luojigou.product.xiaodou.XDConnectActivity
 import com.luojigou.product.xiaodou.XDConnectService
 
@@ -37,6 +39,17 @@ abstract class BaseActivity : AppCompatActivity() {
         }
     }
 
+    protected fun setFragment(fragment: Fragment) {
+        val fragmentManager = supportFragmentManager;
+        val beginTransaction = fragmentManager.beginTransaction()
+        if (fragmentManager.findFragmentById(R.id.fragment_container) == null) {
+            beginTransaction.add(R.id.fragment_container, fragment)
+        } else {
+            beginTransaction.replace(R.id.fragment_container, fragment)
+        }
+        beginTransaction.commit()
+    }
+
     private fun setupFinishReceiver() {
         if (!_isFinishing && this !is XDConnectActivity) {
             val intentFilter = IntentFilter()

xiaodou/src/main/java/com/luojigou/product/base/BaseFragment.kt

@@ -0,0 +1,6 @@
+package com.luojigou.product.base
+
+import androidx.fragment.app.Fragment
+
+open class BaseFragment : Fragment() {
+}

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDBLEConnectStatus.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDBLEConnectStatus.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 sealed class XDBLEConnectStatus() {
     object Waiting : XDBLEConnectStatus()

xiaodou/src/main/java/com/luojigou/product/ble/XDBLEController.kt

@@ -0,0 +1,16 @@
+package com.luojigou.product.ble
+
+import android.bluetooth.le.ScanFilter
+import android.bluetooth.le.ScanSettings
+import android.content.Context
+
+class XDBLEController(private val context: Context) {
+    @Volatile
+    private var bleScanning = false
+
+    private val bleScanSettings = ScanSettings.Builder()
+        .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
+        .build()
+
+    private val bleScanFilters = mutableListOf<ScanFilter>()
+}

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDBLEUtils.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDBLEUtils.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 import android.util.Log
 

xiaodou/src/main/java/com/luojigou/product/xiaodou/XDScanBLEActivity.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDScanBLEActivity.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou
+package com.luojigou.product.ble
 
 import android.Manifest
 import android.bluetooth.BluetoothAdapter
@@ -14,11 +14,6 @@ import androidx.core.app.ActivityCompat
 import androidx.fragment.app.Fragment
 import com.luojigou.product.R
 import com.luojigou.product.base.BaseActivity
-import com.luojigou.product.xiaodou.ble.XDScanBLEDisableFragment
-import com.luojigou.product.xiaodou.ble.XDScanBLENormalFragment
-import com.luojigou.product.xiaodou.ble.XDScanBLENotSupportFragment
-import com.luojigou.product.xiaodou.ble.XDScanBLEPermissionFragment
-import com.luojigou.product.xiaodou.ble.XDScanBLEStatus
 
 
 class XDScanBLEActivity : BaseActivity(), XDScanBLEStatus.Host {
@@ -114,16 +109,5 @@ class XDScanBLEActivity : BaseActivity(), XDScanBLEStatus.Host {
         setFragment(normalFragment)
     }
 
-    private fun setFragment(fragment: Fragment) {
-        val fragmentManager = supportFragmentManager;
-        val beginTransaction = fragmentManager.beginTransaction()
-        if (fragmentManager.findFragmentById(R.id.fragment_container) == null) {
-            beginTransaction.add(R.id.fragment_container, fragment)
-        } else {
-            beginTransaction.replace(R.id.fragment_container, fragment)
-        }
-        beginTransaction.commit()
-    }
-
     override fun onStatusChanged(status: XDScanBLEStatus) = checkBluetoothPermissionAndEnable()
 }

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDScanBLEAdapter.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDScanBLEAdapter.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
@@ -13,9 +13,9 @@ import com.luojigou.product.R
 
 @SuppressLint("MissingPermission")
 class XDScanBLEAdapter(
-    private val itemClickListener: (com.luojigou.product.xiaodou.ble.XDScanBLEDevice) -> Unit,
+    private val itemClickListener: (XDScanBLEDevice) -> Unit,
 ) : RecyclerView.Adapter<XDScanBLEAdapter.ViewHolder>() {
-    private val list: MutableSet<com.luojigou.product.xiaodou.ble.XDScanBLEDevice> = ArraySet()
+    private val list: MutableSet<XDScanBLEDevice> = ArraySet()
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val itemView: View =
@@ -39,13 +39,13 @@ class XDScanBLEAdapter(
     }
 
     @SuppressLint("NotifyDataSetChanged")
-    fun setValues(values: List<com.luojigou.product.xiaodou.ble.XDScanBLEDevice>) {
+    fun setValues(values: List<XDScanBLEDevice>) {
         list.clear()
         list.addAll(values)
         notifyDataSetChanged()
     }
 
-    fun addValue(value: com.luojigou.product.xiaodou.ble.XDScanBLEDevice) {
+    fun addValue(value: XDScanBLEDevice) {
         list.add(value)
         notifyItemChanged(list.size - 1)
     }

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDScanBLEDevice.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDScanBLEDevice.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 import android.bluetooth.BluetoothDevice
 import android.os.Parcel

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDScanBLEDisableFragment.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDScanBLEDisableFragment.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDScanBLEGattCallback.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDScanBLEGattCallback.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 import android.annotation.SuppressLint
 import android.bluetooth.BluetoothGattCallback

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDScanBLENormalFragment.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDScanBLENormalFragment.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
@@ -23,7 +23,7 @@ import com.luojigou.product.xiaodou.XDConnectService.Companion.ACTION_SCAN_RESUL
 import com.luojigou.product.xiaodou.XDConnectService.Companion.ACTION_SCAN_RESULT_DATA
 import com.luojigou.product.xiaodou.XDConnectService.Companion.ACTION_START_SCAN
 import com.luojigou.product.xiaodou.XDConnectService.Companion.ACTION_STOP_SCAN
-import com.luojigou.product.xiaodou.XDScanWifiActivity
+import com.luojigou.product.wifi.XDScanWifiActivity
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.MainScope
 

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDScanBLENotSupportFragment.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDScanBLENotSupportFragment.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 import android.os.Bundle
 import android.view.LayoutInflater

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDScanBLEPermissionFragment.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDScanBLEPermissionFragment.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 import android.Manifest
 import android.os.Build

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDScanBLEStatus.kt → xiaodou/src/main/java/com/luojigou/product/ble/XDScanBLEStatus.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.ble
+package com.luojigou.product.ble
 
 sealed class XDScanBLEStatus {
     object Disabled : XDScanBLEStatus()

xiaodou/src/main/java/com/luojigou/product/intro/AbsIntroduceActivity.kt

@@ -0,0 +1,54 @@
+package com.luojigou.product.intro
+
+import android.util.Log
+import android.view.View
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import com.luojigou.product.R
+import com.luojigou.product.base.BaseActivity
+import com.luojigou.product.utils.PermissionUtils
+
+abstract class AbsIntroduceActivity : BaseActivity(), View.OnClickListener,
+    IntroducePermissionFragment.Host {
+
+    private lateinit var permissionUtils: PermissionUtils
+
+    private lateinit var requestPermission: ActivityResultLauncher<Array<String>>
+
+    override fun onCreate(savedInstanceState: android.os.Bundle?) {
+        super.onCreate(savedInstanceState)
+        setTitle("连接引导")
+        requestPermission =
+            registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) {
+                if (it.all { permission -> permission.value }) {
+                    setFragment(IntroduceNormalFragment())
+                } else {
+                    Log.e("XDScanWifiActivity", "requestPermission: 权限被拒绝")
+                }
+            }
+        permissionUtils = PermissionUtils(this)
+        checkAndSetFragment()
+    }
+
+    private fun checkAndSetFragment() {
+        if (permissionUtils.checkAllPermissions()) {
+            setFragment(IntroduceNormalFragment())
+        } else {
+            setFragment(IntroducePermissionFragment(this))
+        }
+    }
+
+    override fun getLayoutId(): Int = R.layout.activity_introduce
+
+    override fun onClick(v: View?) {
+        when (v?.id) {
+            R.id.btn_intro_start -> startActivity()
+        }
+    }
+
+    override fun requestPermission() {
+        requestPermission.launch(permissionUtils.requestAllPermissions())
+    }
+
+    abstract fun startActivity()
+}

xiaodou/src/main/java/com/luojigou/product/intro/IntroduceNormalFragment.kt

@@ -0,0 +1,36 @@
+package com.luojigou.product.intro
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import com.luojigou.product.R
+import com.luojigou.product.base.BaseFragment
+
+class IntroduceNormalFragment : BaseFragment(), View.OnClickListener {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(
+            R.layout.fragment_introduce_normal,
+            container,
+            false,
+            )
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val buttonStart = view.findViewById<Button>(R.id.btn_intro_start)
+        buttonStart.setOnClickListener(this)
+    }
+
+    override fun onClick(v: View?) {
+        when (v?.id) {
+            R.id.btn_intro_start -> requireActivity()
+        }
+    }
+}

xiaodou/src/main/java/com/luojigou/product/intro/IntroducePermissionFragment.kt

@@ -0,0 +1,30 @@
+package com.luojigou.product.intro
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import com.luojigou.product.R
+import com.luojigou.product.base.BaseFragment
+
+class IntroducePermissionFragment(private val host: Host) : BaseFragment() {
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_introduce_permission, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val button = view.findViewById<Button>(R.id.btn_intro_request)
+        button.setOnClickListener { host.requestPermission() }
+    }
+
+    interface Host {
+        fun requestPermission()
+    }
+}

xiaodou/src/main/java/com/luojigou/product/utils/PermissionUtils.kt

@@ -0,0 +1,53 @@
+package com.luojigou.product.utils
+
+import android.Manifest
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.core.app.ActivityCompat
+
+internal class PermissionUtils(private val context: Context) {
+    companion object {
+        private val blePermissions: Array<String> by lazy {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                arrayOf(
+                    Manifest.permission.BLUETOOTH_SCAN,
+                    Manifest.permission.BLUETOOTH_ADVERTISE,
+                    Manifest.permission.BLUETOOTH_CONNECT
+                )
+            } else {
+                arrayOf(
+                    Manifest.permission.ACCESS_FINE_LOCATION
+                )
+            }
+        }
+
+        private val wifiPermissions: Array<String> by lazy {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                arrayOf(
+                    Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.CHANGE_WIFI_STATE
+                )
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                arrayOf(Manifest.permission.CHANGE_WIFI_STATE)
+            } else {
+                arrayOf()
+            }
+        }
+
+        private val permissions: Array<String> by lazy {
+            blePermissions + wifiPermissions
+        }
+    }
+
+    fun checkAllPermissions(): Boolean {
+        return permissions.find {
+            ActivityCompat.checkSelfPermission(context, it) != PackageManager.PERMISSION_GRANTED
+        } == null
+    }
+
+    fun requestAllPermissions(): Array<String> {
+        return permissions.filter {
+            ActivityCompat.checkSelfPermission(context, it) != PackageManager.PERMISSION_GRANTED
+        }.toTypedArray()
+    }
+}

xiaodou/src/main/java/com/luojigou/product/xiaodou/XDScanWifiActivity.kt → xiaodou/src/main/java/com/luojigou/product/wifi/XDScanWifiActivity.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou
+package com.luojigou.product.wifi
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -12,10 +12,6 @@ import android.os.Bundle
 import androidx.fragment.app.Fragment
 import com.luojigou.product.R
 import com.luojigou.product.base.BaseActivity
-import com.luojigou.product.xiaodou.wifi.XDScanWifiDisableFragment
-import com.luojigou.product.xiaodou.wifi.XDScanWifiNormalFragment
-import com.luojigou.product.xiaodou.wifi.XDScanWifiPermissionFragment
-import com.luojigou.product.xiaodou.wifi.XDScanWifiStatus
 
 class XDScanWifiActivity : BaseActivity(), XDScanWifiStatus.Host {
     companion object {
@@ -53,17 +49,6 @@ class XDScanWifiActivity : BaseActivity(), XDScanWifiStatus.Host {
 
     override fun getWifiManager(): WifiManager = wifiManager
 
-    private fun setFragment(fragment: Fragment) {
-        val fragmentManager = supportFragmentManager;
-        val beginTransaction = fragmentManager.beginTransaction()
-        if (fragmentManager.findFragmentById(R.id.fragment_container) == null) {
-            beginTransaction.add(R.id.fragment_container, fragment)
-        } else {
-            beginTransaction.replace(R.id.fragment_container, fragment)
-        }
-        beginTransaction.commit()
-    }
-
     override fun onStatusChanged(status: XDScanWifiStatus) =
         checkWifiPermissionAndEnable()
 

xiaodou/src/main/java/com/luojigou/product/xiaodou/wifi/XDScanWifiAdapter.kt → xiaodou/src/main/java/com/luojigou/product/wifi/XDScanWifiAdapter.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.wifi
+package com.luojigou.product.wifi
 
 import android.net.wifi.ScanResult
 import android.os.Build

xiaodou/src/main/java/com/luojigou/product/xiaodou/wifi/XDScanWifiDisableFragment.kt → xiaodou/src/main/java/com/luojigou/product/wifi/XDScanWifiDisableFragment.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.wifi
+package com.luojigou.product.wifi
 
 import android.content.Intent
 import android.net.wifi.WifiManager

xiaodou/src/main/java/com/luojigou/product/xiaodou/wifi/XDScanWifiInfo.kt → xiaodou/src/main/java/com/luojigou/product/wifi/XDScanWifiInfo.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.wifi
+package com.luojigou.product.wifi
 
 import android.net.wifi.ScanResult
 import android.os.Build

xiaodou/src/main/java/com/luojigou/product/xiaodou/wifi/XDScanWifiNormalFragment.kt → xiaodou/src/main/java/com/luojigou/product/wifi/XDScanWifiNormalFragment.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.wifi
+package com.luojigou.product.wifi
 
 import android.annotation.SuppressLint
 import android.content.BroadcastReceiver

xiaodou/src/main/java/com/luojigou/product/xiaodou/wifi/XDScanWifiPasswordFragment.kt → xiaodou/src/main/java/com/luojigou/product/wifi/XDScanWifiPasswordFragment.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.wifi
+package com.luojigou.product.wifi
 
 import android.os.Bundle
 import android.view.LayoutInflater

xiaodou/src/main/java/com/luojigou/product/xiaodou/wifi/XDScanWifiPasswordWithSsidFragment.kt → xiaodou/src/main/java/com/luojigou/product/wifi/XDScanWifiPasswordWithSsidFragment.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.wifi
+package com.luojigou.product.wifi
 
 import android.content.Context
 import android.os.Bundle

xiaodou/src/main/java/com/luojigou/product/xiaodou/wifi/XDScanWifiPermissionFragment.kt → xiaodou/src/main/java/com/luojigou/product/wifi/XDScanWifiPermissionFragment.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.wifi
+package com.luojigou.product.wifi
 
 import android.os.Build
 import android.os.Bundle

xiaodou/src/main/java/com/luojigou/product/xiaodou/wifi/XDScanWifiStatus.kt → xiaodou/src/main/java/com/luojigou/product/wifi/XDScanWifiStatus.kt

@@ -1,4 +1,4 @@
-package com.luojigou.product.xiaodou.wifi
+package com.luojigou.product.wifi
 
 import android.net.wifi.WifiManager
 

xiaodou/src/main/java/com/luojigou/product/xiaodou/XDConnectActivity.kt

@@ -19,7 +19,7 @@ import com.luojigou.product.xiaodou.connect.XDConnectPasswordFragment
 import com.luojigou.product.xiaodou.connect.XDConnectPasswordSsidFragment
 import com.luojigou.product.xiaodou.connect.XDConnectSuccessFragment
 import com.luojigou.product.xiaodou.connect.XDConnectTimeoutFragment
-import com.luojigou.product.xiaodou.wifi.ssid
+import com.luojigou.product.wifi.ssid
 
 class XDConnectActivity : BaseActivity() {
     companion object {
@@ -94,17 +94,6 @@ class XDConnectActivity : BaseActivity() {
 
     override fun getLayoutId(): Int = R.layout.activity_connect
 
-    private fun setFragment(fragment: Fragment) {
-        val fragmentManager = supportFragmentManager;
-        val beginTransaction = fragmentManager.beginTransaction()
-        if (fragmentManager.findFragmentById(R.id.fragment_container) == null) {
-            beginTransaction.add(R.id.fragment_container, fragment)
-        } else {
-            beginTransaction.replace(R.id.fragment_container, fragment)
-        }
-        beginTransaction.commit()
-    }
-
     override fun onDestroy() {
         unregisterReceiver(connectReceiver)
         super.onDestroy()

xiaodou/src/main/java/com/luojigou/product/xiaodou/XDConnectService.kt

@@ -25,9 +25,9 @@ import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
-import com.luojigou.product.xiaodou.ble.XDBLEUtils
-import com.luojigou.product.xiaodou.ble.XDScanBLEDevice
-import com.luojigou.product.xiaodou.wifi.XDScanWifiInfo
+import com.luojigou.product.ble.XDBLEUtils
+import com.luojigou.product.ble.XDScanBLEDevice
+import com.luojigou.product.wifi.XDScanWifiInfo
 import java.util.UUID
 import kotlin.concurrent.thread
 

xiaodou/src/main/java/com/luojigou/product/xiaodou/XDIntroduceActivity.kt

@@ -1,7 +1,8 @@
 package com.luojigou.product.xiaodou
 
 import android.content.Intent
-import com.luojigou.product.base.AbsIntroduceActivity
+import com.luojigou.product.intro.AbsIntroduceActivity
+import com.luojigou.product.ble.XDScanBLEActivity
 
 class XDIntroduceActivity : AbsIntroduceActivity() {
     override fun startActivity() {

xiaodou/src/main/java/com/luojigou/product/xiaodou/ble/XDBLEController.kt

@@ -1,7 +0,0 @@
-package com.luojigou.product.xiaodou.ble
-
-import android.content.Context
-
-class XDBLEController(private val context: Context) {
-
-}

xiaodou/src/main/java/com/luojigou/product/xiaodou/connect/XDConnectPasswordFragment.kt

@@ -11,7 +11,7 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.luojigou.product.R
 import com.luojigou.product.xiaodou.XDConnectService
-import com.luojigou.product.xiaodou.wifi.XDScanWifiInfo
+import com.luojigou.product.wifi.XDScanWifiInfo
 
 class XDConnectPasswordFragment(private val ssid: String) : Fragment() {
     override fun onCreateView(

xiaodou/src/main/java/com/luojigou/product/xiaodou/connect/XDConnectPasswordSsidFragment.kt

@@ -10,7 +10,7 @@ import android.widget.EditText
 import androidx.fragment.app.Fragment
 import com.luojigou.product.R
 import com.luojigou.product.xiaodou.XDConnectService
-import com.luojigou.product.xiaodou.wifi.XDScanWifiInfo
+import com.luojigou.product.wifi.XDScanWifiInfo
 
 class XDConnectPasswordSsidFragment : Fragment() {
     override fun onCreateView(

xiaodou/src/main/res/layout/activity_introduce.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.fragment.app.FragmentContainerView
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>

xiaodou/src/main/res/layout/fragment_introduce_permission.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="权限申请说明" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity=""
+            android:paddingHorizontal="20dp"
+            android:text="通过手机给设备配网过程中会用到蓝牙、WiFi等功能，这些功能需要用户授权相关权限后才可正常使用。" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity=""
+            android:paddingHorizontal="20dp"
+            android:text="蓝牙权限说明" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity=""
+            android:paddingHorizontal="20dp"
+            android:text="" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity=""
+            android:paddingHorizontal="20dp"
+            android:text="WIFI权限说明" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity=""
+            android:paddingHorizontal="20dp"
+            android:text="" />
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btn_intro_request"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:text="继续并授予权限" />
+</LinearLayout>