更新V11.6

修复通知权限申请bug 修复全屏打开横屏闪退bug 修复小窗打开错误bug
mingzhixian · Jun 28, 2023 · 83e0474 · 83e0474
1 parent 1af6296
commit 83e0474
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 30 deletions.
diff --git a/scrcpy_android/.idea/deploymentTargetDropDown.xml b/scrcpy_android/.idea/deploymentTargetDropDown.xml
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 24
         targetSdk 33
-        versionCode 115
-        versionName "11.5"
+        versionCode 116
+        versionName "11.6"
         resConfigs "zh"
         resConfigs "xhdpi"
         ndk {

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
@@ -201,7 +201,10 @@ class FloatVideo(
     floatVideo.findViewById<LinearLayout>(R.id.float_video_title1).visibility = View.VISIBLE
     floatVideo.findViewById<LinearLayout>(R.id.float_video_title2).visibility = View.VISIBLE
     // 隐藏导航球
-    floatNav.setOnTouchListener(null)
+    try {
+      floatNav.setOnTouchListener(null)
+    } catch (_: Exception) {
+    }
     hideFloatNav()
     // 设置屏幕方向
     appData.main.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED

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
@@ -12,12 +12,10 @@ import android.view.*
 import android.view.KeyEvent.*
 import android.view.MotionEvent.*
 import android.widget.*
-import androidx.core.app.NotificationManagerCompat
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import okhttp3.Request
@@ -74,11 +72,6 @@ class MainActivity : Activity(), ViewModelStoreOwner {
     }
   }
 
-  override fun onDestroy() {
-    super.onDestroy()
-    appData.mainScope.cancel()
-  }
-
   // 其他页面回调
   override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
     // ShowApp页面回调
@@ -103,23 +96,6 @@ class MainActivity : Activity(), ViewModelStoreOwner {
       Toast.makeText(appData.main, "请授予悬浮窗权限", Toast.LENGTH_SHORT).show()
       return
     }
-    // 检查通知权限
-    if (!NotificationManagerCompat.from(this).areNotificationsEnabled()) {
-      // 请求通知权限
-      val intent =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-          Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-            .putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
-            .putExtra(Settings.EXTRA_CHANNEL_ID, applicationInfo.uid)
-        } else {
-          Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-            .putExtra("app_package", packageName)
-            .putExtra("app_uid", applicationInfo.uid)
-        }
-      startActivity(intent)
-      Toast.makeText(appData.main, "请授予通知权限", Toast.LENGTH_SHORT).show()
-      return
-    }
   }
 
   // 读取数据库并展示设备列表

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
@@ -87,8 +87,6 @@ class Scrcpy(private val device: Device) {
         setAudioDecodec()
         // 配置音频播放
         if (canAudio) setAudioTrack()
-        // 投屏中
-        device.status = 1
         // 设置被控端熄屏（默认投屏后熄屏）
         setPowerOff()
       } catch (e: Exception) {
@@ -128,6 +126,8 @@ class Scrcpy(private val device: Device) {
           stop("投屏停止", e)
         }
       }.start()
+      // 投屏中
+      device.status = 1
     }
   }