一些小优化，和防呆设计

mingzhixian · Apr 28, 2023 · 3e0b27a · 3e0b27a
1 parent 9bca7e4
commit 3e0b27a
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git 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 78
-        versionName "7.8"
+        versionCode 79
+        versionName "7.9"
         resConfigs "zh"
         resConfigs "xhdpi"
         ndk {

diff --git a/scrcpy_android/app/src/main/AndroidManifest.xml b/scrcpy_android/app/src/main/AndroidManifest.xml
@@ -8,6 +8,7 @@
     <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/MainActivity.kt b/scrcpy_android/app/src/main/java/top/saymzx/scrcpy_android/MainActivity.kt
@@ -119,8 +119,7 @@ class MainActivity : AppCompatActivity() {
       addDeviceView.findViewById<Button>(R.id.add_device_ok).setOnClickListener {
         deviceAdapter.newDevice(
           addDeviceView.findViewById<EditText>(R.id.add_device_name).text.toString(),
-          addDeviceView.findViewById<EditText>(R.id.add_device_address).text.toString()
-            .replace("\\s|\\n|\\r|\\t".toRegex(), ""),
+          addDeviceView.findViewById<EditText>(R.id.add_device_address).text.toString(),
           addDeviceView.findViewById<EditText>(R.id.add_device_port).text.toString().toInt(),
           addDeviceView.findViewById<Spinner>(R.id.add_device_videoCodec).selectedItem.toString(),
           addDeviceView.findViewById<Spinner>(R.id.add_device_resolution).selectedItem.toString()
@@ -639,8 +638,20 @@ class MainActivity : AppCompatActivity() {
 
   // 按键广播处理
   inner class ScreenReceiver : BroadcastReceiver() {
-    override fun onReceive(p0: Context?, p1: Intent?) {
+    @SuppressLint("WrongConstant")
+    override fun onReceive(context: Context?, intent: Intent?) {
       if (configs.status > 0) {
+        // 如果为通知栏关闭则自动收起通知栏
+        try {
+          val service = getSystemService("statusbar")
+          if (service != null) {
+            val collapse = Class.forName("android.app.StatusBarManager").getMethod("collapsePanels")
+            collapse.isAccessible = true
+            collapse.invoke(service)
+          }
+        } catch (e: Exception) {
+          e.printStackTrace()
+        }
         // 恢复为未投屏状态
         configs.status = -1
         // 取消强制旋转

diff --git a/scrcpy_android/app/src/main/res/layout/add_device.xml b/scrcpy_android/app/src/main/res/layout/add_device.xml
@@ -54,6 +54,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
+                    android:digits="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ."
                     android:textSize="@dimen/middleFont" />
             </LinearLayout>
 
@@ -74,6 +75,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
+                    android:digits="1234567890"
+                    android:text="5555"
                     android:textSize="@dimen/middleFont" />
             </LinearLayout>
 

diff --git a/scrcpy_android/app/src/main/res/values/string.xml b/scrcpy_android/app/src/main/res/values/string.xml
@@ -15,8 +15,8 @@
     <string-array name="fps">
         <item>60</item>
         <item>90</item>
-        <item>30</item>
         <item>40</item>
+        <item>30</item>
         <item>10</item>
     </string-array>
     <string-array name="videoBit">