perf: 优化代码

limuyang2 · Jul 4, 2023 · 09fc163 · 09fc163
1 parent 3607adc
commit 09fc163
Showing 1 changed file with 23 additions and 24 deletions.
diff --git a/photolibrary/src/main/java/top/limuyang2/photolibrary/activity/LBaseActivity.kt b/photolibrary/src/main/java/top/limuyang2/photolibrary/activity/LBaseActivity.kt
@@ -1,8 +1,6 @@
 package top.limuyang2.photolibrary.activity
 
 import android.content.Intent
-import android.content.res.Configuration
-import android.graphics.Point
 import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
@@ -32,34 +30,35 @@ abstract class LBaseActivity<V : ViewBinding> : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         setTheme(intentTheme)
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-
-            val display = window.windowManager.defaultDisplay
-
-            val nowPoint = Point()
-            display.getRealSize(nowPoint)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val display = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                this.display
+            } else {
+                @Suppress("DEPRECATION")
+                windowManager.defaultDisplay
+            }
 
-            val modes = display.supportedModes
+            if (display != null) {
+                val mode = display.mode
+                val currentWidth = mode.physicalWidth
+                val currentHeight = mode.physicalHeight
 
-            modes.sortBy {
-                it.refreshRate
-            }
+                val modes = display.supportedModes
 
-            // 只找90Hz的
-            val filterModes = if (resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
-                modes.filter { m ->
-                    m.refreshRate == 90f && m.physicalWidth == nowPoint.x && m.physicalHeight == nowPoint.y
+                modes.sortBy { m ->
+                    m.refreshRate
                 }
-            } else {
-                modes.filter { m ->
-                    m.refreshRate == 90f && m.physicalWidth == nowPoint.y && m.physicalHeight == nowPoint.x
+
+                // 只找90Hz的
+                val filterModes = modes.filter { m ->
+                    m.refreshRate == 90f && m.physicalWidth == currentWidth && m.physicalHeight == currentHeight
                 }
-            }
 
-            filterModes.lastOrNull()?.let {
-                val lp = window.attributes
-                lp.preferredDisplayModeId = it.modeId
-                window.attributes = lp
+                filterModes.lastOrNull()?.let { m ->
+                    val lp = window.attributes
+                    lp.preferredDisplayModeId = m.modeId
+                    window.attributes = lp
+                }
             }
         }