From 479251fb67a49c5c1a0f2c4c77d0d94b88b4684b Mon Sep 17 00:00:00 2001
From: LittleTurtle2333 <lturtle2333@outlook.com>
Date: Wed, 29 Jun 2022 16:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B1=85=E4=B8=AD=E6=8C=96?=
 =?UTF-8?q?=E5=AD=94=E5=85=BC=E5=AE=B9=E6=A8=A1=E5=BC=8F(=E7=BD=91?=
 =?UTF-8?q?=E9=80=9F=E5=8F=B3=E6=98=BE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hook/app/systemui/StatusBarLayout.kt      | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarLayout.kt b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarLayout.kt
index 9b439707..bf644c4b 100644
--- a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarLayout.kt
+++ b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarLayout.kt
@@ -11,15 +11,16 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.constraintlayout.widget.ConstraintLayout
 import cn.fkj233.ui.activity.dp2px
-import com.github.kyuubiran.ezxhelper.utils.findMethod
-import com.github.kyuubiran.ezxhelper.utils.getObjectAs
-import com.github.kyuubiran.ezxhelper.utils.hookAfter
+import com.github.kyuubiran.ezxhelper.utils.*
 import com.lt2333.simplicitytools.util.XSPUtils
 import com.lt2333.simplicitytools.util.hasEnable
 import com.lt2333.simplicitytools.util.xposed.base.HookRegister
 
 object StatusBarLayout : HookRegister() {
 
+    private val getMode = XSPUtils.getInt("status_bar_layout_mode", 0)
+    private val getHoleLocation = XSPUtils.getInt("screen_hole_location", 0)
+
     private var statusBarLeft = 0
     private var statusBarTop = 0
     private var statusBarRight = 0
@@ -46,7 +47,16 @@ object StatusBarLayout : HookRegister() {
             }
         }
 
-        when (XSPUtils.getInt("status_bar_layout_mode", 0)) {
+        //判断是否开启居中挖孔兼容模式
+        if (getHoleLocation == 1) {
+            findMethod("com.android.systemui.ScreenDecorations\$DisplayCutoutView") {
+                name == "boundsFromDirection" && parameterCount == 3 && isStatic
+            }.hookBefore {
+                it.args[1] = 0
+            }
+        }
+
+        when (getMode) {
             //默认
             0 -> return
             //时钟居中
@@ -150,7 +160,7 @@ object StatusBarLayout : HookRegister() {
                     statusBarBottom = statusBar!!.paddingBottom
 
 
-                    if (XSPUtils.getBoolean("layout_compatibility_mode", false)) {
+                    if (getHoleLocation == 2) {
                         val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0)
                         if (customLeftMargin != 0) {
                             statusBarLeft = customLeftMargin
@@ -365,7 +375,7 @@ object StatusBarLayout : HookRegister() {
                     statusBarBottom = statusBar!!.paddingBottom
 
 
-                    if (XSPUtils.getBoolean("layout_compatibility_mode", false)) {
+                    if (getHoleLocation == 2) {
                         val customLeftMargin = XSPUtils.getInt("status_bar_left_margin", 0)
                         if (customLeftMargin != 0) {
                             statusBarLeft = customLeftMargin
@@ -382,7 +392,7 @@ object StatusBarLayout : HookRegister() {
                 findMethod("com.android.systemui.statusbar.phone.PhoneStatusBarView") {
                     name == "updateLayoutForCutout"
                 }.hookAfter {
-                    if (XSPUtils.getBoolean("layout_compatibility_mode", false)) {
+                    if (getHoleLocation == 2) {
                         val context = (it.thisObject as ViewGroup).context
                         updateLayout(context)
                     }
@@ -409,5 +419,4 @@ object StatusBarLayout : HookRegister() {
             }
         }
     }
-
 }
\ No newline at end of file