From 317340bf6fb95c138a053802d58b3be8fdeb4691 Mon Sep 17 00:00:00 2001
From: Howie <40895875+HowieHChen@users.noreply.github.com>
Date: Mon, 27 Feb 2023 16:36:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=8B=89=E5=8F=96=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=20#233?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 修改 隐藏 SIM 卡 的方法

* 修改 隐藏 SIM 卡 的方法
---
 .../hooks/rules/t/systemui/HideSimIconForT.kt  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/HideSimIconForT.kt b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/HideSimIconForT.kt
index 69cc370e..1b4f4ea6 100644
--- a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/HideSimIconForT.kt
+++ b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/HideSimIconForT.kt
@@ -2,22 +2,24 @@ package com.lt2333.simplicitytools.hooks.rules.t.systemui
 
 import com.github.kyuubiran.ezxhelper.utils.findMethod
 import com.github.kyuubiran.ezxhelper.utils.hookBefore
+import com.github.kyuubiran.ezxhelper.utils.putObject
+import com.lt2333.simplicitytools.utils.getObjectField
 import com.lt2333.simplicitytools.utils.hasEnable
 import com.lt2333.simplicitytools.utils.xposed.base.HookRegister
 
 object HideSimIconForT : HookRegister() {
 
     override fun init() {
-        findMethod("com.android.systemui.statusbar.phone.StatusBarSignalPolicy") {
-            name == "hasCorrectSubs" && parameterTypes[0] == MutableList::class.java
+        findMethod("com.android.systemui.statusbar.StatusBarMobileView") {
+            name == "applyMobileState"
         }.hookBefore {
-            val list = it.args[0] as MutableList<*>
-            val size = list.size
-            hasEnable("hide_sim_two_icon", extraCondition = { size == 2 }) {
-                list.removeAt(1)
+            val mobileIconState = it.args[0]
+            val subId = mobileIconState.getObjectField("subId") as Int
+            hasEnable("hide_sim_one_icon", extraCondition = { subId == 1 }) {
+                mobileIconState.putObject("visible", false)
             }
-            hasEnable("hide_sim_one_icon", extraCondition = { size >= 1 }) {
-                list.removeAt(0)
+            hasEnable("hide_sim_two_icon", extraCondition = { subId == 2 }) {
+                mobileIconState.putObject("visible", false)
             }
         }
     }