修复新版 QQ 设置页面的圆角问题

This commit is contained in:
2022-04-01 13:25:18 +08:00
parent 2d31d46cd2
commit 9d48732140
2 changed files with 7 additions and 3 deletions

View File

@@ -38,7 +38,7 @@ android {
buildTypes { buildTypes {
release { release {
minifyEnabled true minifyEnabled false
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
} }

View File

@@ -32,6 +32,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.ViewGroup.LayoutParams.MATCH_PARENT import android.view.ViewGroup.LayoutParams.MATCH_PARENT
import android.view.ViewGroup.LayoutParams.WRAP_CONTENT import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
import android.view.ViewGroup.MarginLayoutParams
import android.widget.Toast import android.widget.Toast
import com.fankes.tsbattery.BuildConfig import com.fankes.tsbattery.BuildConfig
import com.fankes.tsbattery.data.DataConst import com.fankes.tsbattery.data.DataConst
@@ -39,6 +40,7 @@ import com.fankes.tsbattery.hook.HookConst.QQ_PACKAGE_NAME
import com.fankes.tsbattery.hook.HookConst.TIM_PACKAGE_NAME import com.fankes.tsbattery.hook.HookConst.TIM_PACKAGE_NAME
import com.fankes.tsbattery.hook.HookConst.WECHAT_PACKAGE_NAME import com.fankes.tsbattery.hook.HookConst.WECHAT_PACKAGE_NAME
import com.fankes.tsbattery.ui.activity.MainActivity import com.fankes.tsbattery.ui.activity.MainActivity
import com.fankes.tsbattery.utils.factory.dp
import com.fankes.tsbattery.utils.factory.showDialog import com.fankes.tsbattery.utils.factory.showDialog
import com.fankes.tsbattery.utils.factory.versionCode import com.fankes.tsbattery.utils.factory.versionCode
import com.fankes.tsbattery.utils.factory.versionName import com.fankes.tsbattery.utils.factory.versionName
@@ -369,7 +371,7 @@ class HookEntry : YukiHookXposedInitProxy {
method { method {
name = "setBgType" name = "setBgType"
param(IntType) param(IntType)
}.get(it).call(2) }.get(it).call(if (isQQ) 0 else 2)
} }
it.setOnClickListener { it.setOnClickListener {
instance<Activity>().apply { instance<Activity>().apply {
@@ -398,12 +400,14 @@ class HookEntry : YukiHookXposedInitProxy {
} }
} }
} }
}.apply { }?.apply {
var listGroup = formItemRefRoot?.parent as? ViewGroup? var listGroup = formItemRefRoot?.parent as? ViewGroup?
val lparam = (if (listGroup?.childCount == 1) { val lparam = (if (listGroup?.childCount == 1) {
listGroup = listGroup.parent as? ViewGroup listGroup = listGroup.parent as? ViewGroup
(formItemRefRoot?.parent as? View?)?.layoutParams (formItemRefRoot?.parent as? View?)?.layoutParams
} else formItemRefRoot?.layoutParams) ?: ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT) } else formItemRefRoot?.layoutParams) ?: ViewGroup.LayoutParams(MATCH_PARENT, WRAP_CONTENT)
/** 设为圆角和间距 */
if (isQQ) (lparam as? MarginLayoutParams?)?.setMargins(0, 15.dp(context), 0, 0)
/** 将 Item 添加到设置界面 */ /** 将 Item 添加到设置界面 */
listGroup?.also { if (isQQ) it.addView(this, lparam) else it.addView(this, 0, lparam) } listGroup?.also { if (isQQ) it.addView(this, lparam) else it.addView(this, 0, lparam) }
} }