优化MTKView布局和状态管理，确保视频背景色自定义和全屏模式下的布局适配

Author: Wtrwx

DYYY.xm

@@ -4448,98 +4448,84 @@ static BOOL DYYYIsLandscapeVideoBounds(CGSize size) {
     return aspectRatio >= (referenceAspect - tolerance);
 }
 
-static char kDYYYMTKViewShiftAppliedOffsetKey;
+%hook MTKView
 
-static void DYYYResetMTKViewShiftState(UIView *view) {
-    if (!view) {
-        return;
+- (void)layoutSubviews {
+    %orig;
+    UIViewController *vc = [DYYYUtils firstAvailableViewControllerFromView:self];
+    Class playVCClass = NSClassFromString(@"AWEPlayVideoViewController");
+    if (vc && playVCClass && [vc isKindOfClass:playVCClass]) {
+        NSString *colorHex = [[NSUserDefaults standardUserDefaults] objectForKey:@"DYYYVideoBGColor"];
+        if (colorHex && colorHex.length > 0) {
+            CGFloat screenWidth = [UIScreen mainScreen].bounds.size.width;
+            UIColor *customColor = [DYYYUtils colorFromSchemeHexString:colorHex targetWidth:screenWidth];
+            if (customColor)
+                self.backgroundColor = customColor;
+        }
     }
-    objc_setAssociatedObject(view, &kDYYYMTKViewShiftAppliedOffsetKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
-static CGFloat DYYYDesiredMTKViewShiftOffset(UIView *view) {
-    if (!view || !view.superview) {
-        return 0.0f;
+- (void)setFrame:(CGRect)frame {
+    UIViewController *vc = [DYYYUtils firstAvailableViewControllerFromView:self];
+    Class playVCClass = NSClassFromString(@"AWEPlayVideoViewController");
+    BOOL isPlayVC = (vc && playVCClass && [vc isKindOfClass:playVCClass]);
+
+    objc_setAssociatedObject(self, _cmd, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    %orig(frame);
+
+    if (!isPlayVC) {
+        return;
+    }
+
+    NSNumber *storedValue = objc_getAssociatedObject(self, _cmd);
+    if (!self.superview) {
+        if (storedValue) {
+            objc_setAssociatedObject(self, _cmd, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        }
+        return;
     }
+
     if (!DYYYGetBool(@"DYYYEnableFullScreen")) {
-        return 0.0f;
+        return;
     }
-    if (!DYYYIsLandscapeVideoBounds(view.bounds.size)) {
-        return 0.0f;
+    if (!DYYYIsLandscapeVideoBounds(self.bounds.size)) {
+        return;
     }
-    CGFloat viewWidth = CGRectGetWidth(view.bounds);
+
+    CGFloat viewWidth = CGRectGetWidth(self.bounds);
     CGFloat screenWidth = [UIScreen mainScreen].bounds.size.width;
-    if (viewWidth < screenWidth * 0.995f) {
-        return 0.0f;
-    }
-    if (gCurrentTabBarHeight <= 0.0f) {
-        return 0.0f;
-    }
-    return gCurrentTabBarHeight * 0.5f;
-}
 
-static void DYYYApplyMTKViewShiftIfNeeded(UIView *view) {
-    if (!view) {
+    if (viewWidth < screenWidth * 0.995f) {
         return;
     }
 
-    NSNumber *storedValue = objc_getAssociatedObject(view, &kDYYYMTKViewShiftAppliedOffsetKey);
-    if (!view.superview) {
-        if (storedValue) {
-            objc_setAssociatedObject(view, &kDYYYMTKViewShiftAppliedOffsetKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-        }
+    CGFloat tabHeight = gCurrentTabBarHeight;
+    if (tabHeight <= 0.0f) {
         return;
     }
 
-    CGFloat desiredOffset = DYYYDesiredMTKViewShiftOffset(view);
+    CGFloat desiredOffset = tabHeight * 0.6f;
     CGFloat appliedOffset = storedValue ? storedValue.doubleValue : 0.0f;
     CGFloat delta = desiredOffset - appliedOffset;
     if (fabs(delta) < 0.1f) {
         if (desiredOffset <= 0.0f && storedValue) {
-            objc_setAssociatedObject(view, &kDYYYMTKViewShiftAppliedOffsetKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+            objc_setAssociatedObject(self, _cmd, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
         }
         return;
     }
 
-    CGPoint position = view.layer.position;
+    CGPoint position = self.layer.position;
     position.y -= delta;
 
     [CATransaction begin];
     [CATransaction setDisableActions:YES];
-    view.layer.position = position;
+    self.layer.position = position;
     [CATransaction commit];
 
     if (desiredOffset > 0.0f) {
-        objc_setAssociatedObject(view, &kDYYYMTKViewShiftAppliedOffsetKey, @(desiredOffset), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+        objc_setAssociatedObject(self, _cmd, @(desiredOffset), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     } else {
-        objc_setAssociatedObject(view, &kDYYYMTKViewShiftAppliedOffsetKey, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-    }
-}
-
-%hook MTKView
-
-- (void)layoutSubviews {
-    %orig;
-    UIViewController *vc = [DYYYUtils firstAvailableViewControllerFromView:self];
-    Class playVCClass = NSClassFromString(@"AWEPlayVideoViewController");
-    if (vc && playVCClass && [vc isKindOfClass:playVCClass]) {
-        NSString *colorHex = [[NSUserDefaults standardUserDefaults] objectForKey:@"DYYYVideoBGColor"];
-        if (colorHex && colorHex.length > 0) {
-            CGFloat screenWidth = [UIScreen mainScreen].bounds.size.width;
-            UIColor *customColor = [DYYYUtils colorFromSchemeHexString:colorHex targetWidth:screenWidth];
-            if (customColor)
-                self.backgroundColor = customColor;
-        }
-    }
-}
-
-- (void)setFrame:(CGRect)frame {
-    UIViewController *vc = [DYYYUtils firstAvailableViewControllerFromView:self];
-    Class playVCClass = NSClassFromString(@"AWEPlayVideoViewController");
-    DYYYResetMTKViewShiftState(self);
-    %orig(frame);
-    if (vc && playVCClass && [vc isKindOfClass:playVCClass]) {
-        DYYYApplyMTKViewShiftIfNeeded(self);
+        objc_setAssociatedObject(self, _cmd, nil, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     }
 }
 
@@ -5904,28 +5890,11 @@ static void *DYYYTabBarHeightContext = &DYYYTabBarHeightContext;
             %orig(frame);
             return;
         }
-
-        if (fabs(frame.origin.x) > 0.1 || fabs(frame.origin.y) > 0.1) {
-            %orig(frame);
-            return;
-        }
-
-        UIView *superView = self.superview;
-        if (!superView) {
-            %orig(frame);
-            return;
-        }
-
-        CGFloat superHeight = CGRectGetHeight(superView.bounds);
-        CGFloat frameHeight = CGRectGetHeight(frame);
-        CGFloat frameWidth = CGRectGetWidth(frame);
-
-        if (superHeight > 0 && frameHeight > 0 && frameHeight < superHeight) {
-            CGFloat diff = superHeight - frameHeight;
-            BOOL isLandscapeFrame = (frameWidth > frameHeight);
-
-            if (!isLandscapeFrame && fabs(diff - gCurrentTabBarHeight) < 1.0) {
-                frame.size.height = superHeight;
+        CGRect superF = self.superview.frame;
+        if (CGRectGetHeight(superF) > 0 && CGRectGetHeight(frame) > 0 && CGRectGetHeight(frame) < CGRectGetHeight(superF)) {
+            CGFloat diff = CGRectGetHeight(superF) - CGRectGetHeight(frame);
+            if (fabs(diff - gCurrentTabBarHeight) < 1.0) {
+                frame.size.height = CGRectGetHeight(superF);
             }
         }
 
@@ -7040,21 +7009,23 @@ static Class TagViewClass = nil;
 %hook TTPlayerView
 
 - (void)setFrame:(CGRect)frame {
-    if (DYYYGetBool(@"DYYYEnableFullScreen")) {
-        CGFloat currentTabHeight = DYYYCurrentTabHeight();
-        if (currentTabHeight > 0.0f) {
-            frame.size.height += 25.0f;
-        }
+    if (DYYYGetBool(@"DYYYEnableFullScreen") && gCurrentTabBarHeight > 0.0f) {
+        frame.size.height += 25.0f;
     }
     %orig(frame);
 }
 
 %end
 
 %hook AWELandscapeFeedEntryView
+
 - (void)setCenter:(CGPoint)center {
     if (DYYYGetBool(@"DYYYEnableFullScreen")) {
-        center.y += gCurrentTabBarHeight * 0.5;
+        UIViewController *vc = [DYYYUtils firstAvailableViewControllerFromView:self];
+        Class pureModeVC = NSClassFromString(@"AWEFeedPlayControlImpl.PureModePageCellViewController");
+        if (vc && pureModeVC && [vc isKindOfClass:pureModeVC]) {
+            center.y += gCurrentTabBarHeight * 0.5;
+        }
     }
 
     %orig(center);
@@ -7086,18 +7057,6 @@ static Class TagViewClass = nil;
     %orig;
 }
 
-- (void)setCenter:(CGPoint)center {
-    if (DYYYGetBool(@"DYYYEnableFullScreen")) {
-        UIViewController *vc = [DYYYUtils firstAvailableViewControllerFromView:self];
-        Class pureModeVC = NSClassFromString(@"AWEFeedPlayControlImpl.PureModePageCellViewController");
-        if (vc && pureModeVC && [vc isKindOfClass:pureModeVC]) {
-            center.y += tabHeight * 0.5;
-        }
-    }
-
-    %orig(center);
-}
-
 - (void)layoutSubviews {
     %orig;
     if (DYYYGetBool(@"DYYYRemoveEntry")) {