diff --git a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarBigMobileTypeIconForT.kt b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarBigMobileTypeIconForT.kt index 5304ddbf..c39748b0 100644 --- a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarBigMobileTypeIconForT.kt +++ b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/StatusBarBigMobileTypeIconForT.kt @@ -16,12 +16,10 @@ object StatusBarBigMobileTypeIconForT : HookRegister() { private val getLocation = XSPUtils.getInt("big_mobile_type_location", 1) private val upAndDownPosition = XSPUtils.getInt("big_mobile_type_icon_up_and_down_position", 0) - private val leftAndRightMargin = - XSPUtils.getInt("big_mobile_type_icon_left_and_right_margins", 0) + private val leftAndRightMargin = XSPUtils.getInt("big_mobile_type_icon_left_and_right_margins", 0) private val isBold = XSPUtils.getBoolean("big_mobile_type_icon_bold", true) private val size = XSPUtils.getFloat("big_mobile_type_icon_size", 12.5f) - private val isOnlyShowNetwork = - XSPUtils.getBoolean("big_mobile_type_only_show_network_card", false) + private val isOnlyShowNetwork = XSPUtils.getBoolean("big_mobile_type_only_show_network_card", false) override fun init() = hasEnable("big_mobile_type_icon") { //使网络类型单独显示 @@ -41,16 +39,13 @@ object StatusBarBigMobileTypeIconForT : HookRegister() { val res: Resources = context.resources //获取组件 - val mobileContainerLeftId: Int = - res.getIdentifier("mobile_container_left", "id", "com.android.systemui") - val mobileContainerLeft = - statusBarMobileView.findViewById(mobileContainerLeftId) + val mobileContainerLeftId: Int = res.getIdentifier("mobile_container_left", "id", "com.android.systemui") + val mobileContainerLeft = statusBarMobileView.findViewById(mobileContainerLeftId) val mobileGroupId: Int = res.getIdentifier("mobile_group", "id", "com.android.systemui") val mobileGroup = statusBarMobileView.findViewById(mobileGroupId) - val mobileTypeSingleId: Int = - res.getIdentifier("mobile_type_single", "id", "com.android.systemui") + val mobileTypeSingleId: Int = res.getIdentifier("mobile_type_single", "id", "com.android.systemui") val mobileTypeSingle = statusBarMobileView.findViewById(mobileTypeSingleId) //更改顺序 @@ -70,10 +65,8 @@ object StatusBarBigMobileTypeIconForT : HookRegister() { leftAndRightMargin, upAndDownPosition, leftAndRightMargin, 0 ) //显示非上网卡的大图标 - if (!isOnlyShowNetwork) { - if (!mobileIconState.getObjectAs("dataConnected")) { - mobileTypeSingle.visibility = View.VISIBLE - } + if (!mobileIconState.getObjectAs("dataConnected") && !mobileIconState.getObjectAs("wifiAvailable")) { + mobileTypeSingle.visibility = View.VISIBLE } } //显示非上网卡的大图标 @@ -86,12 +79,10 @@ object StatusBarBigMobileTypeIconForT : HookRegister() { val context: Context = statusBarMobileView.context val res: Resources = context.resources - val mobileTypeSingleId: Int = - res.getIdentifier("mobile_type_single", "id", "com.android.systemui") - val mobileTypeSingle = - statusBarMobileView.findViewById(mobileTypeSingleId) + val mobileTypeSingleId: Int = res.getIdentifier("mobile_type_single", "id", "com.android.systemui") + val mobileTypeSingle = statusBarMobileView.findViewById(mobileTypeSingleId) - if (!mobileIconState.getObjectAs("dataConnected")) { + if (!mobileIconState.getObjectAs("dataConnected") && !mobileIconState.getObjectAs("wifiAvailable")) { mobileTypeSingle.visibility = View.VISIBLE } }