diff --git "a/pic/\350\257\264\346\230\216/show_app_1.svg" "b/pic/\350\257\264\346\230\216/show_app_1.svg"
new file mode 100644
index 00000000..d8886765
--- /dev/null
+++ "b/pic/\350\257\264\346\230\216/show_app_1.svg"
@@ -0,0 +1,15 @@
+<svg width="1024" height="2400" xmlns="http://www.w3.org/2000/svg" t="1684830946878" class="icon" version="1.1" p-id="4172">
+ <g id="Layer_1">
+  <title>Layer 1</title>
+  <text opacity="0.7" font-weight="bold" transform="matrix(5.60752 0 0 5.77016 -554.9 -1450.12)" stroke="#000" xml:space="preserve" text-anchor="start" font-family="'Noto Sans Mono'" font-size="24" id="svg_1" y="331.00695" x="102.78538" fill="#000000">Scrcpy_android</text>
+  <g stroke="null" opacity="0.65">
+   <path stroke="null" d="m839.5438,1282.55098l-234.02276,0c-32.3411,0 -58.48768,25.86195 -58.48768,57.69205l0,461.60748c0,31.90115 26.21862,57.69205 58.48768,57.69205l234.02276,0c32.3411,0 58.48768,-25.86195 58.48768,-57.69205l0,-461.60748c0,-31.8301 -26.21862,-57.69205 -58.48768,-57.69205z" fill="#4DBBF7"/>
+   <path stroke="null" d="m766.36217,1239.28194c16.13453,0 29.24384,12.93098 29.24384,28.84603l0,461.60748c0,15.91505 -13.10931,28.84603 -29.24384,28.84603l-233.95074,0c-16.13453,0 -29.24384,-12.93098 -29.24384,-28.84603l0,-461.60748c0,-15.91505 13.10931,-28.84603 29.24384,-28.84603l233.95074,0m0,-43.26904l-233.95074,0c-40.40836,0 -73.1096,32.32744 -73.1096,72.11507l0,461.60748c0,39.85867 32.77327,72.11507 73.1096,72.11507l234.02276,0c40.40836,0 73.1096,-32.32744 73.1096,-72.11507l0,-461.60748c0,-39.78762 -32.77327,-72.11507 -73.18163,-72.11507z" fill="#3d3c36"/>
+   <path stroke="null" d="m664.00872,1744.22951l-29.24384,0c-16.0625,0 -29.24384,-13.00203 -29.24384,-28.84603l0,-28.84603c0,-15.844 13.18134,-28.84603 29.24384,-28.84603l29.24384,0c16.0625,0 29.24384,13.00203 29.24384,28.84603l0,28.84603c0,15.844 -13.18134,28.84603 -29.24384,28.84603z" fill="#3d3c36"/>
+  </g>
+  <text xml:space="preserve" text-anchor="start" font-family="'Noto Sans Mono'" font-size="53" id="svg_3" y="770.38627" x="92.96302" stroke-width="0" stroke="#000" fill="#000000">欢迎使用Scrcpy_android</text>
+  <text xml:space="preserve" text-anchor="start" font-family="'Noto Sans Mono'" font-size="53" id="svg_4" y="885.20107" x="189.25931" stroke-width="0" stroke="#000" fill="#000000">本软件基于开源项目scrcpy</text>
+  <text xml:space="preserve" text-anchor="start" font-family="'Noto Sans Mono'" font-size="53" stroke-width="0" id="svg_6" y="992.60848" x="292.96301" stroke="#000" fill="#000000">实现了Scrcpy安卓客户端</text>
+ </g>
+
+</svg>
\ No newline at end of file
diff --git a/scrcpy_android/app/build.gradle b/scrcpy_android/app/build.gradle
index 4caa9caf..d7c661cb 100644
--- a/scrcpy_android/app/build.gradle
+++ b/scrcpy_android/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "top.saymzx.scrcpy_android"
         minSdk 23
         targetSdk 33
-        versionCode 84
-        versionName "8.4"
+        versionCode 85
+        versionName "8.5"
         resConfigs "zh"
         resConfigs "xhdpi"
         ndk {
@@ -46,8 +46,6 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
-
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-
     implementation("dev.mobile:dadb:1.2.6")
 }
diff --git a/scrcpy_android/app/src/main/AndroidManifest.xml b/scrcpy_android/app/src/main/AndroidManifest.xml
index b069d6ae..b7cc464f 100644
--- a/scrcpy_android/app/src/main/AndroidManifest.xml
+++ b/scrcpy_android/app/src/main/AndroidManifest.xml
@@ -5,10 +5,8 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.REORDER_TASKS" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
-    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
 
     <application
         android:icon="@drawable/icon"
diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/AppData.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/AppData.kt
index 1eb08581..e83e6df3 100644
--- a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/AppData.kt
+++ b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/AppData.kt
@@ -2,6 +2,8 @@ package top.saymzx.scrcpy_android
 
 import android.annotation.SuppressLint
 import android.app.AlertDialog
+import android.content.Context
+import android.content.SharedPreferences
 import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
@@ -15,7 +17,7 @@ import java.io.File
 class AppData : ViewModel() {
 
   // 是否初始化
-  var isInit=false
+  var isInit = false
 
   // 数据库管理
   lateinit var dbHelper: DbHelper
@@ -32,15 +34,20 @@ class AppData : ViewModel() {
   var deviceWidth = 0
   var deviceHeight = 0
 
+  // 设置值
+  lateinit var settings: SharedPreferences
+
   // 加载框（全局通用）
   @SuppressLint("StaticFieldLeak")
   lateinit var loadingDialog: AlertDialog
+
   @SuppressLint("StaticFieldLeak")
   lateinit var loading: View
 
   // 初始化数据
   fun init(main: MainActivity) {
-    isInit=true
+    isInit = true
+    settings = main.getSharedPreferences("setting", Context.MODE_PRIVATE)
     // 获取系统分辨率
     val metric = DisplayMetrics()
     main.windowManager.defaultDisplay.getRealMetrics(metric)
@@ -49,7 +56,7 @@ class AppData : ViewModel() {
     if (deviceWidth > deviceHeight) deviceWidth =
       deviceWidth xor deviceHeight xor deviceWidth.also { deviceHeight = it }
     // 数据库管理
-    dbHelper = DbHelper(main, "scrcpy_android.db", 4)
+    dbHelper = DbHelper(main, "scrcpy_android.db", 5)
     deviceAdapter = DeviceAdapter(main)
     // 从数据库获取设备列表
     val cursor = dbHelper.readableDatabase.query("DevicesDb", null, null, null, null, null, null)
@@ -65,7 +72,8 @@ class AppData : ViewModel() {
             cursor.getInt(cursor.getColumnIndex("fps")),
             cursor.getInt(cursor.getColumnIndex("videoBit")),
             cursor.getInt(cursor.getColumnIndex("setResolution")) == 1,
-            cursor.getInt(cursor.getColumnIndex("defaultFull")) == 1
+            cursor.getInt(cursor.getColumnIndex("defaultFull")) == 1,
+            cursor.getInt(cursor.getColumnIndex("floatNav")) == 1
           )
         )
       } while (cursor.moveToNext())
@@ -92,7 +100,8 @@ class AppData : ViewModel() {
     loading.findViewById<TextView>(R.id.loading_text).text = text
     if (isCanCancel) {
       loading.findViewById<Button>(R.id.loading_cancel).visibility = View.VISIBLE
-      loading.findViewById<Button>(R.id.loading_cancel).setOnClickListener { cancelFun?.let { it1 -> it1() } }
+      loading.findViewById<Button>(R.id.loading_cancel)
+        .setOnClickListener { cancelFun?.let { it1 -> it1() } }
     } else loading.findViewById<Button>(R.id.loading_cancel).visibility = View.GONE
     loadingDialog.show()
   }
diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/DbHelper.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/DbHelper.kt
index bf53adab..a268d3bc 100644
--- a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/DbHelper.kt
+++ b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/DbHelper.kt
@@ -23,7 +23,8 @@ class DbHelper(
           "\t fps integer,\n" +
           "\t videoBit integer," +
           "\t setResolution integer,"+
-          "\t defaultFull integer"+
+          "\t defaultFull integer,"+
+          "\t floatNav integer"+
           ")"
     )
   }
@@ -124,5 +125,50 @@ class DbHelper(
       // 删除旧表
       db.execSQL("drop table DevicesDbOld")
     }
+    // 修改列名，增加是否显示导航球列
+    if (oldVersion < 5) {
+      // 修改表名
+      db!!.execSQL("alter table DevicesDb rename to DevicesDbOld")
+      // 新建新表
+      db.execSQL(
+        "CREATE TABLE DevicesDb (\n" +
+            "\t name text PRIMARY KEY,\n" +
+            "\t address text,\n" +
+            "\t port integer,\n" +
+            "\t videoCodec text,\n" +
+            "\t maxSize integer,\n" +
+            "\t fps integer,\n" +
+            "\t videoBit integer," +
+            "\t setResolution integer,"+
+            "\t defaultFull integer,"+
+            "\t floatNav integer"+
+            ")"
+      )
+      // 将数据搬移至新表
+      val cursor =
+        db.query("DevicesDbOld", null, null, null, null, null, null)
+      if (cursor.moveToFirst()) {
+        do {
+          val values = ContentValues().apply {
+            put("name", cursor.getString(cursor.getColumnIndex("name")))
+            put("address", cursor.getString(cursor.getColumnIndex("address")))
+            put("port", cursor.getInt(cursor.getColumnIndex("port")))
+            put("videoCodec", cursor.getString(cursor.getColumnIndex("videoCodec")))
+            // 修改为默认值
+            put("maxSize", "1600")
+            put("fps", cursor.getString(cursor.getColumnIndex("fps")))
+            // 修改为默认值
+            put("videoBit", "8000000")
+            put("setResolution", 1)
+            put("defaultFull", 1)
+            put("floatNav", 1)
+          }
+          db.insert("DevicesDb", null, values)
+        } while (cursor.moveToNext())
+      }
+      cursor.close()
+      // 删除旧表
+      db.execSQL("drop table DevicesDbOld")
+    }
   }
 }
\ No newline at end of file
diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/Device.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/Device.kt
index e20602eb..d043c764 100644
--- a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/Device.kt
+++ b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/Device.kt
@@ -9,10 +9,11 @@ class Device(
   val fps: Int,
   val videoBit: Int,
   val setResolution:Boolean,
-  val defaultFull:Boolean
+  val defaultFull:Boolean,
+  val floatNav:Boolean
 ){
   var isFull=defaultFull
-  // -10为停止状态，-1~-9为停止中，0为准备中，1为已连接ADB，2为已连接音视频，3为投屏中
-  var status=-10
+  // -1为停止状态，0为准备中，1为投屏中
+  var status=-1
   lateinit var scrcpy: Scrcpy
 }
\ No newline at end of file
diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/DeviceAdapter.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/DeviceAdapter.kt
index 71473386..c30e74f9 100644
--- a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/DeviceAdapter.kt
+++ b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/DeviceAdapter.kt
@@ -27,17 +27,17 @@ class DeviceAdapter(private val main: MainActivity) :
   override fun onBindViewHolder(holder: ViewHolder, position: Int) {
     val device = main.appData.devices[position]
     holder.textViewName.text = device.name
-    val address = "${device.address}:${device.port}"
-    holder.textViewAddress.text = address
+    val addressID = "${device.address}:${device.port}"
+    holder.textViewAddress.text = addressID
     // 单击打开投屏
     holder.linearLayout.setOnClickListener {
-      if (device.status != -10) Toast.makeText(main, "此设备正在投屏或未完全关闭", Toast.LENGTH_SHORT).show()
+      if (device.status != -1) Toast.makeText(main, "此设备正在投屏", Toast.LENGTH_SHORT).show()
       else {
-        device.scrcpy=Scrcpy(device, main)
+        device.scrcpy = Scrcpy(device, main)
         device.scrcpy.start()
       }
     }
-    // 长按删除
+    // 长按选项
     holder.linearLayout.setOnLongClickListener {
       val deleteDeviceView = LayoutInflater.from(main).inflate(R.layout.delete_device, null, false)
       val builder: AlertDialog.Builder = AlertDialog.Builder(main)
@@ -49,7 +49,121 @@ class DeviceAdapter(private val main: MainActivity) :
       deleteDeviceView.findViewById<Button>(R.id.delete_device_cancel).setOnClickListener {
         dialog.cancel()
       }
-      deleteDeviceView.findViewById<Button>(R.id.delete_device_ok).setOnClickListener {
+      // 修改
+      deleteDeviceView.findViewById<Button>(R.id.delete_device_change).setOnClickListener {
+        dialog.cancel()
+        // 显示更新框
+        val addDeviceView = LayoutInflater.from(main).inflate(R.layout.add_device, null, false)
+        val updateBuilder: AlertDialog.Builder = AlertDialog.Builder(main)
+        updateBuilder.setView(addDeviceView)
+        updateBuilder.setCancelable(false)
+        val updateDialog = updateBuilder.create()
+        updateDialog.setCanceledOnTouchOutside(true)
+        updateDialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
+        // 控件
+        val name = addDeviceView.findViewById<EditText>(R.id.add_device_name)
+        val address = addDeviceView.findViewById<EditText>(R.id.add_device_address)
+        val port = addDeviceView.findViewById<EditText>(R.id.add_device_port)
+        val videoCodec = addDeviceView.findViewById<Spinner>(R.id.add_device_videoCodec)
+        val maxSize = addDeviceView.findViewById<Spinner>(R.id.add_device_max_size)
+        val fps = addDeviceView.findViewById<Spinner>(R.id.add_device_fps)
+        val videoBit = addDeviceView.findViewById<Spinner>(R.id.add_device_video_bit)
+        val setResolution = addDeviceView.findViewById<Switch>(R.id.add_device_set_resolution)
+        val defaultFull = addDeviceView.findViewById<Switch>(R.id.add_device_default_full)
+        val floatNav = addDeviceView.findViewById<Switch>(R.id.add_device_float_nav)
+        // 是否显示高级选项
+        addDeviceView.findViewById<CheckBox>(R.id.add_device_is_options).setOnClickListener {
+          addDeviceView.findViewById<LinearLayout>(R.id.add_device_options).visibility =
+            if (addDeviceView.findViewById<CheckBox>(R.id.add_device_is_options).isChecked)
+              View.VISIBLE
+            else View.GONE
+        }
+        // 确认按钮
+        addDeviceView.findViewById<Button>(R.id.add_device_ok).setOnClickListener {
+          updateDialog.cancel()
+          val newAddress = address.text.toString()
+          val newPort = port.text.toString().toInt()
+          val newVideoCodec = videoCodec.selectedItem.toString()
+          val newMaxSize = maxSize.selectedItem.toString().toInt()
+          val newFps = fps.selectedItem.toString().toInt()
+          val newVideoBit = videoBit.selectedItem.toString().toInt()
+          val newSetResolution = if (setResolution.isChecked) 1 else 0
+          val newDefaultFull = if (defaultFull.isChecked) 1 else 0
+          val newFloatNav = if (floatNav.isChecked) 1 else 0
+          val values = ContentValues().apply {
+            put("address", newAddress)
+            put("port", newPort)
+            put("videoCodec", newVideoCodec)
+            put("maxSize", newMaxSize)
+            put("fps", newFps)
+            put("videoBit", newVideoBit)
+            put("setResolution", newSetResolution)
+            put("defaultFull", newDefaultFull)
+            put("floatNav", newFloatNav)
+          }
+          if (main.appData.dbHelper.writableDatabase.update(
+              "DevicesDb",
+              values,
+              "name=?",
+              arrayOf(device.name)
+            ) != -1
+          ) {
+            main.appData.devices.remove(device)
+            main.appData.devices.add(
+              Device(
+                device.name,
+                newAddress,
+                newPort,
+                newVideoCodec,
+                newMaxSize,
+                newFps,
+                newVideoBit,
+                newSetResolution == 1,
+                newDefaultFull == 1,
+                newFloatNav == 1
+              )
+            )
+            notifyDataSetChanged()
+          }
+        }
+        updateDialog.show()
+        // 填充参数
+        name.setText(device.name)
+        address.setText(device.address)
+        port.setText(device.port.toString())
+        videoCodec.setSelection(
+          getStringIndex(
+            device.videoCodec,
+            main.resources.getStringArray(R.array.videoCodecItems)
+          )
+        )
+        maxSize.setSelection(
+          getStringIndex(
+            device.maxSize.toString(),
+            main.resources.getStringArray(R.array.maxSizeItems)
+          )
+        )
+        fps.setSelection(
+          getStringIndex(
+            device.fps.toString(),
+            main.resources.getStringArray(R.array.fpsItems)
+          )
+        )
+        videoBit.setSelection(
+          getStringIndex(
+            device.videoBit.toString(),
+            main.resources.getStringArray(R.array.videoBitItems)
+          )
+        )
+        setResolution.isChecked = device.setResolution
+        defaultFull.isChecked = device.defaultFull
+        floatNav.isChecked = device.floatNav
+        // 设置不可变参数
+        name.isFocusable = false
+        name.isFocusableInTouchMode = false
+      }
+      // 删除
+      deleteDeviceView.findViewById<Button>(R.id.delete_device_delete).setOnClickListener {
         main.appData.dbHelper.writableDatabase.delete(
           "DevicesDb", "name = ?", arrayOf(device.name)
         )
@@ -75,7 +189,8 @@ class DeviceAdapter(private val main: MainActivity) :
     fps: Int,
     videoBit: Int,
     setResolution: Boolean,
-    defaultFull: Boolean
+    defaultFull: Boolean,
+    floatNav: Boolean
   ) {
     val values = ContentValues().apply {
       put("name", name)
@@ -87,6 +202,7 @@ class DeviceAdapter(private val main: MainActivity) :
       put("videoBit", videoBit)
       put("setResolution", if (setResolution) 1 else 0)
       put("defaultFull", if (defaultFull) 1 else 0)
+      put("floatNav", if (floatNav) 1 else 0)
     }
     // 名称重复
     if (main.appData.dbHelper.writableDatabase.insert("DevicesDb", null, values).toInt() != -1) {
@@ -100,10 +216,22 @@ class DeviceAdapter(private val main: MainActivity) :
           fps,
           videoBit,
           setResolution,
-          defaultFull
+          defaultFull,
+          floatNav
         )
       )
       notifyDataSetChanged()
     }
   }
+
+  // 获取string 在string array中的位置
+  private fun getStringIndex(str: String, strArray: Array<String>): Int {
+    for ((index, i) in strArray.withIndex()) {
+      if (str == i) return index
+      else index
+    }
+    // 找不到返回0
+    return 0
+  }
+
 }
\ No newline at end of file
diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/FloatVideo.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/FloatVideo.kt
index 7c1133ca..65820a97 100644
--- a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/FloatVideo.kt
+++ b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/FloatVideo.kt
@@ -4,16 +4,13 @@ import android.annotation.SuppressLint
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.content.pm.ActivityInfo
 import android.graphics.PixelFormat
 import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.util.DisplayMetrics
-import android.util.Log
 import android.view.*
 import android.widget.ImageView
 import android.widget.LinearLayout
@@ -72,7 +69,9 @@ class FloatVideo(
   // 隐藏悬浮窗
   fun hide() {
     scrcpy.main.windowManager.removeView(floatVideo)
-    if (scrcpy.device.isFull) scrcpy.main.windowManager.removeView(floatNav)
+    if (scrcpy.device.isFull && scrcpy.device.floatNav) scrcpy.main.windowManager.removeView(
+      floatNav
+    )
   }
 
   // 更新悬浮窗
@@ -81,7 +80,10 @@ class FloatVideo(
       floatVideo,
       floatVideoParams
     )
-    if (scrcpy.device.isFull) scrcpy.main.windowManager.updateViewLayout(floatNav, floatNavParams)
+    if (scrcpy.device.isFull && scrcpy.device.floatNav) scrcpy.main.windowManager.updateViewLayout(
+      floatNav,
+      floatNavParams
+    )
     // 减少未修改大小的无用调用
     if (hasChangeSize) {
       // 更新视频界面大小
@@ -184,7 +186,14 @@ class FloatVideo(
     // 通知栏
     setNotification()
     // 监听导航悬浮球
-    setFloatNavListener()
+    if (scrcpy.device.floatNav) setFloatNavListener()
+    // 取消无用监听
+    floatVideo.findViewById<LinearLayout>(R.id.float_video_bar).setOnTouchListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_stop).setOnClickListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_back).setOnClickListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_home).setOnClickListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_switch).setOnClickListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_set_size).setOnTouchListener(null)
     return true
   }
 
@@ -275,7 +284,7 @@ class FloatVideo(
         scrcpy.main.requestedOrientation =
           if (isLandscape) ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE else ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         // 导航球
-        floatNavParams.apply {
+        if (scrcpy.device.floatNav) floatNavParams.apply {
           x = 40
           y =
             (if (isLandscape) scrcpy.main.appData.deviceWidth else scrcpy.main.appData.deviceHeight) / 2
@@ -362,7 +371,6 @@ class FloatVideo(
 
   // 设置三大金刚键监听控制
   private fun setNavListener() {
-    // 导航按钮监听
     floatVideo.findViewById<ImageView>(R.id.float_video_back).setOnClickListener {
       packNavControl(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK)
       packNavControl(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK)
@@ -379,7 +387,6 @@ class FloatVideo(
 
   // 设置悬浮窗大小拖动按钮监听控制
   private fun setSetSizeListener() {
-    // 悬浮窗大小修改监听
     floatVideo.findViewById<ImageView>(R.id.float_video_set_size).setOnTouchListener { _, event ->
       if (event.actionMasked == MotionEvent.ACTION_MOVE) {
         // 计算新大小（等比缩放，按照最长边缩放）
@@ -445,15 +452,31 @@ class FloatVideo(
             event.action = MotionEvent.ACTION_CANCEL
             barGestureDetector.onTouchEvent(event)
           }
-          // 新位置
-          val newX = event.rawX.toInt() - xx - floatVideoParams.width / 4
-          val newY = event.rawY.toInt() - yy
-          // 避免移动至状态栏等不可触控区域
-          if (newY < statusBarHeight + 10) return@setOnTouchListener true
-          // 移动悬浮窗(非全屏状态)
-          floatVideoParams.x = newX
-          floatVideoParams.y = newY
-          update(false)
+          // 贴边变成小小窗
+          val criticality = scrcpy.main.resources.getDimension(R.dimen.floatNav).toInt()
+          val metric = DisplayMetrics()
+          scrcpy.main.windowManager.defaultDisplay.getRealMetrics(metric)
+          val deviceWidth = metric.widthPixels
+          val rawX = event.rawX.toInt()
+          if ((rawX <= criticality || rawX >= (deviceWidth - criticality)) && event.rawY.toInt() <= criticality) {
+            setSmallSmall()
+            floatVideoParams.x =
+              if (rawX <= criticality) scrcpy.main.resources.getDimension(R.dimen.floatVideoSmallSmallPadding)
+                .toInt() else
+                deviceWidth -floatVideoParams.width- scrcpy.main.resources.getDimension(R.dimen.floatVideoSmallSmallPadding).toInt()
+            floatVideoParams.y = scrcpy.main.resources.getDimension(R.dimen.floatVideoSmallSmallPadding).toInt()
+            update(false)
+          } else {
+            // 新位置
+            val newX = event.rawX.toInt() - xx - floatVideoParams.width / 4
+            val newY = event.rawY.toInt() - yy
+            // 避免移动至状态栏等不可触控区域
+            if (newY < statusBarHeight + 10) return@setOnTouchListener true
+            // 移动悬浮窗
+            floatVideoParams.x = newX
+            floatVideoParams.y = newY
+            update(false)
+          }
         }
         MotionEvent.ACTION_UP -> {
           isMoveVideoBar = false
@@ -466,7 +489,6 @@ class FloatVideo(
 
   // 设置关闭按钮监听控制
   private fun setStopListener() {
-    // 关闭按钮动作监听
     floatVideo.findViewById<ImageView>(R.id.float_video_stop).setOnClickListener {
       scrcpy.stop()
     }
@@ -549,6 +571,103 @@ class FloatVideo(
     }
   }
 
+  // 设置小小窗
+  private fun setSmallSmall() {
+    // 最小化小窗
+    floatVideoParams.apply {
+      if (remoteVideoWidth < remoteVideoHeight) {
+        width = scrcpy.main.resources.getDimension(R.dimen.floatVideoSmallSmall).toInt()
+        height = (remoteVideoHeight / remoteVideoWidth) * width
+      } else {
+        height = scrcpy.main.resources.getDimension(R.dimen.floatVideoSmallSmall).toInt()
+        width = (remoteVideoWidth / remoteVideoHeight) * height
+      }
+    }
+    update(true)
+    // 取消无用监听
+    floatVideo.findViewById<LinearLayout>(R.id.float_video_bar).setOnTouchListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_stop).setOnClickListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_back).setOnClickListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_home).setOnClickListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_switch).setOnClickListener(null)
+    floatVideo.findViewById<ImageView>(R.id.float_video_set_size).setOnTouchListener(null)
+    floatVideo.findViewById<SurfaceView>(R.id.float_video_surface).setOnTouchListener(null)
+    // 设置监听
+    val smallSmallGestureDetector =
+      GestureDetector(scrcpy.main, object : GestureDetector.SimpleOnGestureListener() {
+        override fun onSingleTapUp(event: MotionEvent): Boolean {
+          // 竖屏打开
+          if (remoteVideoHeight > remoteVideoWidth) {
+            floatVideoParams.apply {
+              x = scrcpy.main.appData.deviceWidth / 8
+              y = scrcpy.main.appData.deviceHeight / 8
+              height = scrcpy.main.appData.deviceHeight * 3 / 4
+              width =
+                (remoteVideoWidth.toFloat() / remoteVideoHeight.toFloat() * (height - scrcpy.main.resources.getDimension(
+                  R.dimen.floatVideoTitle
+                ) * 0.7)).toInt()
+            }
+          }
+          // 横屏打开
+          else {
+            floatVideoParams.apply {
+              x = scrcpy.main.appData.deviceWidth / 8
+              y = scrcpy.main.appData.deviceHeight / 8
+              width = scrcpy.main.appData.deviceWidth * 3 / 4
+              height =
+                ((remoteVideoHeight.toFloat() / remoteVideoWidth.toFloat()) * width + scrcpy.main.resources.getDimension(
+                  R.dimen.floatVideoTitle
+                ) * 0.7).toInt()
+            }
+          }
+          update(true)
+          floatVideo.findViewById<LinearLayout>(R.id.float_video).setOnTouchListener(null)
+          setFloatBar()
+          setStopListener()
+          setNavListener()
+          setSetSizeListener()
+          setSurfaceListener()
+          return super.onDoubleTap(event)
+        }
+      })
+    // 记录按下坐标，避免设备过于敏感
+    var xx = 0
+    var yy = 0
+    var isMoveVideo = false
+    floatVideo.findViewById<LinearLayout>(R.id.float_video).setOnTouchListener { _, event ->
+      when (event.actionMasked) {
+        MotionEvent.ACTION_DOWN -> {
+          xx = event.x.toInt()
+          yy = event.y.toInt()
+          smallSmallGestureDetector.onTouchEvent(event)
+        }
+        MotionEvent.ACTION_MOVE -> {
+          val x = event.x.toInt()
+          val y = event.y.toInt()
+          if (!isMoveVideo) {
+            if ((xx - x) * (xx - x) + (yy - y) * (yy - y) < 9) return@setOnTouchListener true
+            isMoveVideo = true
+            // 取消点击监控
+            event.action = MotionEvent.ACTION_CANCEL
+            smallSmallGestureDetector.onTouchEvent(event)
+          }
+          // 新位置
+          val newX = event.rawX.toInt() - xx
+          val newY = event.rawY.toInt() - yy
+          // 移动悬浮窗
+          floatVideoParams.x = newX
+          floatVideoParams.y = newY
+          update(false)
+        }
+        MotionEvent.ACTION_UP -> {
+          isMoveVideo = false
+          smallSmallGestureDetector.onTouchEvent(event)
+        }
+      }
+      return@setOnTouchListener true
+    }
+  }
+
   // 设置通知栏
   @SuppressLint("LaunchActivityFromNotification")
   private fun setNotification() {
@@ -562,7 +681,7 @@ class FloatVideo(
       }
       notificationManager.createNotificationChannel(channel)
     }
-    val intent = Intent("top.saymzx.notification")
+    val intent = Intent("top.saymzx.scrcpy_android.notification")
     val builder =
       NotificationCompat.Builder(scrcpy.main, "scrcpy_android").setSmallIcon(R.drawable.icon)
         .setContentTitle(scrcpy.device.name).setContentText("点击关闭投屏")
diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/MainActivity.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/MainActivity.kt
index dcf56bfa..92c6ebc7 100644
--- a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/MainActivity.kt
+++ b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/MainActivity.kt
@@ -32,9 +32,6 @@ class MainActivity : Activity(), ViewModelStoreOwner {
   // 数据
   val appData = ViewModelProvider(this).get(AppData::class.java)
 
-  // 设置值
-  //val sharedPreferences: SharedPreferences = getSharedPreferences("set", MODE_PRIVATE)
-
   // 广播处理
   private val scrcpyBroadcastReceiver = ScrcpyBroadcastReceiver()
 
@@ -55,7 +52,12 @@ class MainActivity : Activity(), ViewModelStoreOwner {
     // 设置添加按钮监听
     setAddDeviceListener()
     // 如果第一次使用展示介绍信息
-    //if (sharedPreferences.getBoolean("firstUse", true)) startActivity(Intent(this, ShowApp::class.java))
+    if (appData.settings.getBoolean("FirstUse", true)) startActivityForResult(
+      Intent(
+        this,
+        ShowApp::class.java
+      ), 1
+    )
   }
 
   override fun onResume() {
@@ -63,9 +65,13 @@ class MainActivity : Activity(), ViewModelStoreOwner {
     setFullScreen()
     super.onResume()
     // 注册广播用以关闭程序
+    try {
+      unregisterReceiver(scrcpyBroadcastReceiver)
+    } catch (_: IllegalArgumentException) {
+    }
     val filter = IntentFilter()
     filter.addAction(ACTION_SCREEN_OFF)
-    filter.addAction("top.saymzx.notification")
+    filter.addAction("top.saymzx.scrcpy_android.notification")
     registerReceiver(scrcpyBroadcastReceiver, filter)
   }
 
@@ -76,7 +82,20 @@ class MainActivity : Activity(), ViewModelStoreOwner {
       startActivity(intent)
       break
     }
-    unregisterReceiver(scrcpyBroadcastReceiver)
+  }
+
+  // 其他页面回调
+  override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+    // ShowApp页面回调
+    if (requestCode == 1) {
+      if (resultCode == 1) {
+        appData.settings.edit().apply {
+          putBoolean("FirstUse", false)
+          apply()
+        }
+      }
+    }
+    super.onActivityResult(requestCode, resultCode, data)
   }
 
   // 设置全面屏
@@ -132,7 +151,8 @@ class MainActivity : Activity(), ViewModelStoreOwner {
             addDeviceView.findViewById<Spinner>(R.id.add_device_video_bit).selectedItem.toString()
               .toInt(),
             addDeviceView.findViewById<Switch>(R.id.add_device_set_resolution).isChecked,
-            addDeviceView.findViewById<Switch>(R.id.add_device_default_full).isChecked
+            addDeviceView.findViewById<Switch>(R.id.add_device_default_full).isChecked,
+            addDeviceView.findViewById<Switch>(R.id.add_device_float_nav).isChecked
           )
           dialog.cancel()
         }
diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/Scrcpy.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/Scrcpy.kt
index c6a4bab0..678ac096 100644
--- a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/Scrcpy.kt
+++ b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/Scrcpy.kt
@@ -59,8 +59,6 @@ class Scrcpy(val device: Device, val main: MainActivity) {
         sendServer()
         // 转发端口
         tcpForward()
-        // 已连接音视频
-        device.status = 2
         // 配置视频解码
         setVideoDecodec()
         // 配置音频解码
@@ -68,89 +66,21 @@ class Scrcpy(val device: Device, val main: MainActivity) {
         // 配置音频播放
         if (canAudio) setAudioTrack()
         // 视频解码
-        var isVideoFinally = false
-        launch {
-          try {
-            decodeInput("video")
-          } finally {
-            if (isVideoFinally) {
-              videoDecodec.stop()
-              videoDecodec.release()
-              floatVideo.hide()
-            } else isVideoFinally = true
-            device.status--
-          }
-        }
-        launch {
-          try {
-            decodeOutput("video")
-          } finally {
-            if (isVideoFinally) {
-              videoDecodec.stop()
-              videoDecodec.release()
-              floatVideo.hide()
-            } else isVideoFinally = true
-            device.status--
-          }
-        }
+        launch { decodeInput("video") }
+        launch { decodeOutput("video") }
         // 音频解码
-        var isAudioFinally = false
         if (canAudio) {
-          launch {
-            try {
-              decodeInput("audio")
-            } finally {
-              if (isAudioFinally) {
-                audioDecodec.stop()
-                audioDecodec.release()
-                loudnessEnhancer.release()
-                audioTrack.stop()
-                audioTrack.release()
-              } else isAudioFinally = true
-              device.status--
-            }
-          }
-          launch {
-            try {
-              decodeOutput("audio")
-            } finally {
-              if (isAudioFinally) {
-                audioDecodec.stop()
-                audioDecodec.release()
-                loudnessEnhancer.release()
-                audioTrack.stop()
-                audioTrack.release()
-              } else isAudioFinally = true
-              device.status--
-            }
-          }
+          launch { decodeInput("audio") }
+          launch { decodeOutput("audio") }
         }
         // 配置控制输出
-        launch {
-          try {
-            setControlOutput()
-          } finally {
-            withContext(NonCancellable) {
-              // 等待其他结束完成
-              while (device.status > if (canAudio) -5 else -3) delay(50)
-              withContext(Dispatchers.IO) {
-                videoStream.close()
-                audioStream.close()
-                controlStream.close()
-              }
-              adb.close()
-              device.status = -10
-              device.isFull = device.defaultFull
-            }
-          }
-        }
+        launch { setControlOutput() }
         // 投屏中
-        device.status = 3
+        device.status = 1
         // 设置被控端熄屏（默认投屏后熄屏）
         delay(200)
         setPowerOff()
       } catch (e: Exception) {
-        if (device.status < 2) main.appData.loadingDialog.cancel()
         Toast.makeText(main, e.toString(), Toast.LENGTH_SHORT).show()
         Log.e("Scrcpy", e.toString())
         stop()
@@ -160,21 +90,41 @@ class Scrcpy(val device: Device, val main: MainActivity) {
 
   // 停止投屏
   fun stop() {
-    val oldStatus = device.status
+    main.appData.loadingDialog.cancel()
     device.status = -1
-    // 已连接ADB
-    if (oldStatus > 0) {
-      // 恢复分辨率
-      if (device.setResolution) mainScope.launch { runAdbCmd("sleep 2 && wm size reset &") }
-      mainScope.launch { runAdbCmd("sleep 3 && ps -ef | grep scrcpy | grep -v grep | grep -E \"^[a-z]+ +[0-9]+\" -o | grep -E \"[0-9]+\" -o | xargs kill -9 &") }
-      // 已转发端口
-      if (oldStatus > 1) {
-        mainScope.cancel()
-      } else {
-        adb.close()
-        device.status = -10
+    try {
+      floatVideo.hide()
+    } catch (_: Exception) {
+    }
+    try {
+      if (canAudio) {
+        audioDecodec.stop()
+        audioDecodec.release()
+        loudnessEnhancer.release()
+        audioTrack.stop()
+        audioTrack.release()
       }
-    } else device.status = -10
+    } catch (_: Exception) {
+    }
+    try {
+      videoDecodec.stop()
+      videoDecodec.release()
+    } catch (_: Exception) {
+    }
+    try {
+      videoStream.close()
+      audioStream.close()
+      controlStream.close()
+    } catch (_: Exception) {
+    }
+    try {
+      // 恢复分辨率
+      if (device.setResolution) mainScope.launch { runAdbCmd("wm size reset") }
+      mainScope.launch { runAdbCmd("ps -ef | grep scrcpy | grep -v grep | grep -E \"^[a-z]+ +[0-9]+\" -o | grep -E \"[0-9]+\" -o | xargs kill -9") }
+      mainScope.cancel()
+      adb.close()
+    } catch (_: Exception) {
+    }
   }
 
   // 初始化音频播放器
@@ -190,7 +140,7 @@ class Scrcpy(val device: Device, val main: MainActivity) {
     ).setAudioFormat(
       AudioFormat.Builder().setEncoding(AudioFormat.ENCODING_PCM_16BIT).setSampleRate(sampleRate)
         .setChannelMask(AudioFormat.CHANNEL_OUT_STEREO).build()
-    ).setBufferSizeInBytes(minBufferSize * 8).build()
+    ).setBufferSizeInBytes(minBufferSize * 4).build()
     // 声音增强
     try {
       loudnessEnhancer = LoudnessEnhancer(audioTrack.audioSessionId)
@@ -206,8 +156,6 @@ class Scrcpy(val device: Device, val main: MainActivity) {
     // 连接ADB
     adb =
       Dadb.create(ip, device.port, AdbKeyPair.read(main.appData.privateKey, main.appData.publicKey))
-    // 已连接ADB
-    device.status = 1
     // 修改分辨率
     if (device.setResolution) runAdbCmd(
       "wm size ${main.appData.deviceWidth}x${main.appData.deviceHeight}"
@@ -456,8 +404,12 @@ class Scrcpy(val device: Device, val main: MainActivity) {
   // 从socket流中解析数据
   private suspend fun readFrame(stream: BufferedSource): ByteArray {
     return withContext(Dispatchers.IO) {
-      val size = stream.readInt()
-      stream.readByteArray(size.toLong())
+      try {
+        val size = stream.readInt()
+        stream.readByteArray(size.toLong())
+      } catch (_: IllegalStateException) {
+        ByteArray(3)
+      }
     }
   }
 
diff --git a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/ShowApp.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/ShowApp.kt
index 7bd8810f..dad071b3 100644
--- a/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/ShowApp.kt
+++ b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/ShowApp.kt
@@ -1,9 +1,10 @@
 package top.saymzx.scrcpy_android
 
 import android.app.Activity
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
-import android.text.Html
-import android.text.method.LinkMovementMethod
+import android.widget.Button
 import android.widget.TextView
 
 
@@ -11,6 +12,46 @@ class ShowApp : Activity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_show_app)
-      // 设置隐私政策链接
+    // 步骤
+    var step = 1
+    // 设置隐私政策链接
+    findViewById<TextView>(R.id.show_app_privacy).setOnClickListener {
+      try {
+        val intent = Intent(Intent.ACTION_VIEW)
+        intent.addCategory(Intent.CATEGORY_BROWSABLE)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        intent.data = Uri.parse("https://github.com/mingzhixian/scrcpy/blob/master/PRIVACY.md")
+        startActivity(intent)
+      } catch (_: Exception) {
+      }
+    }
+    // 设置下一步按钮
+    findViewById<Button>(R.id.show_app_agree).setOnClickListener {
+      when (step) {
+        // 第二步，展示软件界面
+        1 -> {
+          setResult(1)
+          finish()
+          step++
+        }
+        // 第三步，展示添加设备
+        2 -> {
+          step++
+        }
+        // 第四步，展示小窗使用
+        3 -> {
+          step++
+        }
+        // 第五步，展示全屏使用
+        4 -> {
+          step++
+        }
+        // 第六步，同意隐私协议，进入软件
+        5 -> {
+          setResult(1)
+          finish()
+        }
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/scrcpy_android/app/src/main/res/layout/activity_show_app.xml b/scrcpy_android/app/src/main/res/layout/activity_show_app.xml
index c9199961..abf4bc5d 100644
--- a/scrcpy_android/app/src/main/res/layout/activity_show_app.xml
+++ b/scrcpy_android/app/src/main/res/layout/activity_show_app.xml
@@ -1,32 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/linearLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/appBackground"
     android:orientation="vertical">
 
-  <TextView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="160dp"
-      android:layout_marginBottom="60dp"
-      android:paddingStart="30dp"
-      android:text="Scrcpy_android"
-      android:textColor="#000000"
-      android:textSize="@dimen/veryLargeFont"
-      android:textStyle="bold" />
+    <ImageView
+        android:id="@+id/show_app_image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:src="@drawable/show_app_1" />
 
-  <TextView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_margin="40dp"
-      android:text="  欢迎使用Scrcpy_android，本软件基于开源项目scrcpy，实现了安卓客户端，并进行了一些小的修改，"
-      android:textSize="@dimen/largeFont" />
+    <TextView
+        android:id="@+id/show_app_privacy"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_margin="40dp"
+        android:textStyle="bold"
+        android:text="隐私政策"
+        android:textSize="@dimen/middleFont" />
 
+    <Button
+        android:id="@+id/show_app_agree"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginBottom="30dp"
+        android:background="@drawable/background"
+        android:backgroundTint="@color/buttonBackground"
+        android:text="下一步"
+        android:textSize="@dimen/largeFont"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
-  <TextView
-      android:id="@+id/show_app_privacy"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:textSize="@dimen/middleFont" />
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/scrcpy_android/app/src/main/res/layout/add_device.xml b/scrcpy_android/app/src/main/res/layout/add_device.xml
index 8e21c151..8753d9c3 100644
--- a/scrcpy_android/app/src/main/res/layout/add_device.xml
+++ b/scrcpy_android/app/src/main/res/layout/add_device.xml
@@ -126,7 +126,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:entries="@array/resolutionItems"
+                    android:entries="@array/maxSizeItems"
                     android:foregroundTint="#000000"
                     android:textSize="@dimen/middleFont" />
             </LinearLayout>
@@ -147,7 +147,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:entries="@array/fps"
+                    android:entries="@array/fpsItems"
                     android:textSize="@dimen/middleFont" />
             </LinearLayout>
 
@@ -167,7 +167,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
-                    android:entries="@array/videoBit"
+                    android:entries="@array/videoBitItems"
                     android:textSize="@dimen/middleFont" />
             </LinearLayout>
 
@@ -211,6 +211,26 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:layout_marginTop="8dp">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="是否显示导航球:"
+                    android:textSize="@dimen/largeFont" />
+
+                <Switch
+                    android:id="@+id/add_device_float_nav"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:checked="true"/>
+
+            </LinearLayout>
+
         </LinearLayout>
 
         <Button
diff --git a/scrcpy_android/app/src/main/res/layout/delete_device.xml b/scrcpy_android/app/src/main/res/layout/delete_device.xml
index 292a6ab0..a6b4f119 100644
--- a/scrcpy_android/app/src/main/res/layout/delete_device.xml
+++ b/scrcpy_android/app/src/main/res/layout/delete_device.xml
@@ -16,32 +16,55 @@
             android:layout_marginStart="25dp"
             android:layout_marginTop="25dp"
             android:layout_marginEnd="25dp"
-            android:text="确定删除吗？"
+            android:text="干什么◔ ‸◔？ "
             android:textSize="@dimen/largeFont" />
 
         <Button
             android:id="@+id/delete_device_cancel"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="50dp"
+            android:layout_marginStart="25dp"
             android:layout_marginTop="25dp"
-            android:layout_marginEnd="50dp"
+            android:layout_marginEnd="25dp"
             android:layout_marginBottom="25dp"
             android:background="@drawable/background"
             android:backgroundTint="@color/alertButtonBackground"
             android:text="取消"
             android:textSize="@dimen/largeFont" />
 
-        <Button
-            android:id="@+id/delete_device_ok"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="50dp"
-            android:layout_marginEnd="50dp"
+            android:layout_marginStart="25dp"
+            android:layout_marginEnd="25dp"
             android:layout_marginBottom="25dp"
-            android:background="@drawable/background"
-            android:backgroundTint="@color/cancelButtonBackground"
-            android:text="确认"
-            android:textSize="@dimen/middleFont" />
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/delete_device_change"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="5"
+                android:background="@drawable/background"
+                android:backgroundTint="@color/cancelButtonBackground"
+                android:text="修改"
+                android:textSize="@dimen/middleFont" />
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/delete_device_delete"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="5"
+                android:background="@drawable/background"
+                android:backgroundTint="@color/cancelButtonBackground"
+                android:text="删除"
+                android:textSize="@dimen/middleFont" />
+        </LinearLayout>
+
     </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/scrcpy_android/app/src/main/res/values/size.xml b/scrcpy_android/app/src/main/res/values/size.xml
index cfc14652..ac7d4b1c 100644
--- a/scrcpy_android/app/src/main/res/values/size.xml
+++ b/scrcpy_android/app/src/main/res/values/size.xml
@@ -11,4 +11,6 @@
     <dimen name="floatVideoButtonPadding">9dp</dimen>
     <dimen name="floatVideoNavButtonPadding">6dp</dimen>
     <dimen name="floatNav">60dp</dimen>
+    <dimen name="floatVideoSmallSmall">80dp</dimen>
+    <dimen name="floatVideoSmallSmallPadding">16dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/scrcpy_android/app/src/main/res/values/string.xml b/scrcpy_android/app/src/main/res/values/string.xml
index a0c7e487..dcc445eb 100644
--- a/scrcpy_android/app/src/main/res/values/string.xml
+++ b/scrcpy_android/app/src/main/res/values/string.xml
@@ -4,7 +4,7 @@
         <item>h264</item>
         <item>h265</item>
     </string-array>
-    <string-array name="resolutionItems">
+    <string-array name="maxSizeItems">
         <item>1600</item>
         <item>2560</item>
         <item>1920</item>
@@ -12,7 +12,7 @@
         <item>1024</item>
         <item>800</item>
     </string-array>
-    <string-array name="fps">
+    <string-array name="fpsItems">
         <item>60</item>
         <item>120</item>
         <item>90</item>
@@ -20,7 +20,7 @@
         <item>30</item>
         <item>10</item>
     </string-array>
-    <string-array name="videoBit">
+    <string-array name="videoBitItems">
         <item>8000000</item>
         <item>18000000</item>
         <item>16000000</item>
diff --git a/scrcpy_android/app/src/main/res/values/strings.xml b/scrcpy_android/app/src/main/res/values/strings.xml
deleted file mode 100644
index e5f8fdc2..00000000
--- a/scrcpy_android/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<resources>
-</resources>
\ No newline at end of file
diff --git a/scrcpy_android/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java b/scrcpy_android/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java
index aa102833..50684bff 100644
--- a/scrcpy_android/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java
+++ b/scrcpy_android/server/src/main/java/com/genymobile/scrcpy/AudioCapture.java
@@ -52,7 +52,7 @@ private static AudioRecord createAudioRecord() {
     builder.setAudioFormat(createAudioFormat());
     int minBufferSize = AudioRecord.getMinBufferSize(SAMPLE_RATE, CHANNEL_CONFIG, FORMAT);
     // This buffer size does not impact latency
-    builder.setBufferSizeInBytes(8 * minBufferSize);
+    builder.setBufferSizeInBytes(4 * minBufferSize);
     return builder.build();
   }