Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

opt: 横屏或大屏显示天气适配更多 OS1 设备 #3

Merged
merged 5 commits into from
Jan 13, 2025
Merged

opt: 横屏或大屏显示天气适配更多 OS1 设备 #3

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
796b260
adj: remove mediaeditor some old func
lingqiqi5211 Jan 1, 2025
851105f
[skp]fix: isSwapWiFiAndMobileNetwork (hy1)
lingqiqi5211 Jan 1, 2025
3f6f42f
opt: 通知中心在横屏状态下不隐藏天气组件
xzakota Jan 11, 2025
89424fe
merge: lingqiqi5211/pull
xzakota Jan 13, 2025
ef68e18
opt: 横屏或大屏显示天气适配更多 OS1 设备
xzakota Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 107 additions & 107 deletions ...n/java/com/sevtinge/hyperceiler/module/hook/systemui/controlcenter/NotificationWeather.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ import android.view.*
import android.widget.*
import androidx.annotation.IntDef
import com.github.kyuubiran.ezxhelper.ClassUtils.loadClass
import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createHook
import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createAfterHook
import com.github.kyuubiran.ezxhelper.HookFactory.`-Static`.createBeforeHook
import com.github.kyuubiran.ezxhelper.finders.MethodFinder.`-Static`.methodFinder
import com.sevtinge.hyperceiler.module.base.*
import com.sevtinge.hyperceiler.module.hook.systemui.*
Expand All @@ -35,6 +36,7 @@ import com.sevtinge.hyperceiler.utils.api.LazyClass.miuiConfigs
import com.sevtinge.hyperceiler.utils.devicesdk.*
import com.sevtinge.hyperceiler.utils.devicesdk.DisplayUtils.*
import com.sevtinge.hyperceiler.view.*
import de.robv.android.xposed.XposedHelpers.findMethodExactIfExists

@SuppressLint("DiscouragedApi", "ServiceCast", "StaticFieldLeak")
object NotificationWeather : BaseHook() {
Expand Down Expand Up @@ -92,46 +94,57 @@ object NotificationWeather : BaseHook() {
}

// 更新资源
miuiNotificationHeaderView.methodFinder()
.filterByName("updateHeaderResources")
.single().createHook {
after { param ->
val viewGroup = param.thisObject as ViewGroup
val orientation = viewGroup.getObjectFieldAs<Int>("mOrientation")
if (orientation == -1) {
return@after
}

val dateView = viewGroup.getObjectFieldAs<TextView>("mDateView")
val landClock = viewGroup.getObjectFieldAs<TextView>("mLandClock")

vWeatherView?.setTextSize(0, dateView.textSize)
vWeatherView?.typeface = dateView.typeface

hWeatherView?.setTextSize(0, landClock.textSize)
hWeatherView?.typeface = landClock.typeface
}
updateResources()
// 更新布局
updateLayout()
}

private fun updateResources() {
var method = findMethodExactIfExists(miuiNotificationHeaderView, "updateHeaderResources")
if (method == null) {
method = findMethodExactIfExists(miuiNotificationHeaderView, "updateResources")
}

method?.createAfterHook { param ->
val viewGroup = param.thisObject as ViewGroup
val orientation = viewGroup.getObjectFieldAs<Int>("mOrientation")
if (orientation == -1) {
return@createAfterHook
}

// 更新布局
miuiNotificationHeaderView.methodFinder().filterByName("updateLayout").single().createHook {
before {
val dateView = viewGroup.getObjectFieldAs<TextView>("mDateView")
val landClock = viewGroup.getObjectFieldAs<TextView>("mLandClock")

vWeatherView?.setTextSize(0, dateView.textSize)
vWeatherView?.typeface = dateView.typeface

hWeatherView?.setTextSize(0, landClock.textSize)
hWeatherView?.typeface = landClock.typeface
}
}

private fun updateLayout() {
miuiNotificationHeaderView.methodFinder()
.filterByName("updateLayout")
.single().createBeforeHook {
val viewGroup = it.thisObject as ViewGroup
val context = viewGroup.context
val configuration = context.resources.configuration
val orientation = viewGroup.getObjectFieldAs<Int>("mOrientation")
var orientation = viewGroup.getObjectFieldAs<Int>("mOrientation")
val screenLayout = viewGroup.getObjectFieldAs<Int>("mScreenLayout")

if (orientation == configuration.orientation &&
screenLayout == configuration.screenLayout
) {
return@before
return@createBeforeHook
}

orientation = configuration.orientation

val isVerticalMode = if (isMoreHyperOSVersion(2f)) {
miuiConfigs.callStaticMethodAs("isVerticalMode", context)
} else {
orientation != ORIENTATION_PORTRAIT || isLargeUI()
orientation == ORIENTATION_PORTRAIT || isLargeUI()
}

if (isVerticalMode) {
Expand All @@ -142,122 +155,109 @@ object NotificationWeather : BaseHook() {
vWeatherView?.visibility = View.GONE
}
}
}
}

private fun newNotificationWeather() {
combinedHeaderController.constructors.single().createHook {
after { param ->
val controller = param.thisObject
val dateView = controller.getObjectFieldAs<View>("notificationDateTime")
val landClock = controller.getObjectFieldAs<View>("notificationHorizontalTime")
combinedHeaderController.constructors.single().createAfterHook { param ->
val controller = param.thisObject
val dateView = controller.getObjectFieldAs<View>("notificationDateTime")
val landClock = controller.getObjectFieldAs<View>("notificationHorizontalTime")

addWeatherViewAfterOf(dateView, ORIENTATION_PORTRAIT)
addWeatherViewAfterOf(landClock, ORIENTATION_LANDSCAPE)
addWeatherViewAfterOf(dateView, ORIENTATION_PORTRAIT)
addWeatherViewAfterOf(landClock, ORIENTATION_LANDSCAPE)

// 创建动画
hWeatherView?.let {
hWeatherViewFolme = folme.callStaticMethod("useAt", arrayOf<View>(it))
}
vWeatherView?.let {
vWeatherViewFolme = folme.callStaticMethod("useAt", arrayOf<View>(it))
}
// 创建动画
hWeatherView?.let {
hWeatherViewFolme = folme.callStaticMethod("useAt", arrayOf<View>(it))
}
vWeatherView?.let {
vWeatherViewFolme = folme.callStaticMethod("useAt", arrayOf<View>(it))
}
}

combinedHeaderController.methodFinder()
.filterByName("onSwitchProgressChanged")
.filterByParamTypes(Float::class.java)
.first().createHook {
after { param ->
val controller = param.thisObject
val dateView = controller.getObjectFieldAs<View>("notificationDateTime")
val landClock = controller.getObjectFieldAs<View>("notificationHorizontalTime")
.first().createAfterHook { param ->
val controller = param.thisObject
val dateView = controller.getObjectFieldAs<View>("notificationDateTime")
val landClock = controller.getObjectFieldAs<View>("notificationHorizontalTime")

vWeatherView?.translationX = dateView.translationX
vWeatherView?.translationY = dateView.translationY
vWeatherView?.translationX = dateView.translationX
vWeatherView?.translationY = dateView.translationY

hWeatherView?.translationX = landClock.translationX
hWeatherView?.translationY = landClock.translationY
}
hWeatherView?.translationX = landClock.translationX
hWeatherView?.translationY = landClock.translationY
}

notificationHeaderExpandController.constructors.single().createHook {
after { param ->
val expandController = param.thisObject
val callback = expandController.getObjectFieldAs<Any>("notificationCallback")
notificationHeaderExpandController.constructors.single().createAfterHook { param ->
val expandController = param.thisObject
val callback = expandController.getObjectFieldAs<Any>("notificationCallback")

hookNotificationCallback(expandController, callback::class.java)
}
hookNotificationCallback(expandController, callback::class.java)
}
}

private fun hookNotificationCallback(expandController: Any, clazz: Class<*>) {
clazz.methodFinder().filterByName("onAppearanceChanged").first().createHook {
after {
val newAppearance = it.args[0] as Boolean
val animate = it.args[1] as Boolean

val startFolmeAnimationAlpha = { view: View?, folme: Any? ->
notificationHeaderExpandController.callStaticMethod(
"access\$startFolmeAnimationAlpha",
expandController,
view,
folme,
if (newAppearance) 1F else 0F,
animate,
)
}

startFolmeAnimationAlpha(hWeatherView, hWeatherViewFolme)
startFolmeAnimationAlpha(vWeatherView, vWeatherViewFolme)
clazz.methodFinder().filterByName("onAppearanceChanged").first().createAfterHook {
val newAppearance = it.args[0] as Boolean
val animate = it.args[1] as Boolean

val startFolmeAnimationAlpha = { view: View?, folme: Any? ->
notificationHeaderExpandController.callStaticMethod(
"access\$startFolmeAnimationAlpha",
expandController,
view,
folme,
if (newAppearance) 1F else 0F,
animate,
)
}

startFolmeAnimationAlpha(hWeatherView, hWeatherViewFolme)
startFolmeAnimationAlpha(vWeatherView, vWeatherViewFolme)
}

clazz.methodFinder().filterByName("onExpansionChanged").first().createHook {
after {
val headerController = expandController.getObjectFieldAs<Any>("headerController")
.callMethodAs<Any>("get")
clazz.methodFinder().filterByName("onExpansionChanged").first().createAfterHook {
val headerController = expandController.getObjectFieldAs<Any>("headerController")
.callMethodAs<Any>("get")

headerController.getObjectFieldAs<View>("notificationDateTime").let {
vWeatherView?.translationX = it.translationX
vWeatherView?.translationY = it.translationY
}
headerController.getObjectFieldAs<View>("notificationDateTime").let {
vWeatherView?.translationX = it.translationX
vWeatherView?.translationY = it.translationY
}

headerController.getObjectFieldAs<View>("notificationHorizontalTime").let {
hWeatherView?.translationX = it.translationX
hWeatherView?.translationY = it.translationY
}
headerController.getObjectFieldAs<View>("notificationHorizontalTime").let {
hWeatherView?.translationX = it.translationX
hWeatherView?.translationY = it.translationY
}
}
}

private fun oldNotificationWeather() {
miuiNotificationHeaderView.methodFinder()
.filterByName("onFinishInflate")
.single().createHook {
after { param ->
val viewGroup = param.thisObject as ViewGroup
val context = viewGroup.context

val dateView = viewGroup.findViewById<View>(
context.resources.getIdentifier(
"date_time",
"id",
context.packageName
)
.single().createAfterHook { param ->
val viewGroup = param.thisObject as ViewGroup
val context = viewGroup.context

val dateView = viewGroup.findViewById<View>(
context.resources.getIdentifier(
"date_time",
"id",
context.packageName
)
val landClock = viewGroup.findViewById<View>(
context.resources.getIdentifier(
"horizontal_time",
"id",
context.packageName
)
)
val landClock = viewGroup.findViewById<View>(
context.resources.getIdentifier(
"horizontal_time",
"id",
context.packageName
)
)

addWeatherViewAfterOf(dateView, ORIENTATION_PORTRAIT)
addWeatherViewAfterOf(landClock, ORIENTATION_LANDSCAPE)
}
addWeatherViewAfterOf(dateView, ORIENTATION_PORTRAIT)
addWeatherViewAfterOf(landClock, ORIENTATION_LANDSCAPE)
}
}

Expand Down
Loading