优化清除按钮和速度按钮的可见性管理逻辑，确保在不同状态下正确显示或隐藏

Author: Wtrwx

DYYYFloatClearButton.xm

@@ -20,6 +20,33 @@ BOOL isInPlayInteractionVC = NO;
 BOOL isPureViewVisible = NO;
 BOOL clearButtonForceHidden = NO;
 BOOL isAppActive = YES;
+BOOL dyyyIsPerformingFloatClearOperation = NO;
+
+static NSInteger dyyyClearButtonMutationDepth = 0;
+
+static inline void DYYYBeginClearButtonMutation(void) {
+    dyyyClearButtonMutationDepth++;
+    dyyyIsPerformingFloatClearOperation = YES;
+}
+
+static inline void DYYYEndClearButtonMutation(void) {
+    if (dyyyClearButtonMutationDepth > 0) {
+        dyyyClearButtonMutationDepth--;
+    }
+    dyyyIsPerformingFloatClearOperation = dyyyClearButtonMutationDepth > 0;
+}
+
+static void DYYYPerformClearButtonMutation(dispatch_block_t block) {
+    if (!block) {
+        return;
+    }
+    DYYYBeginClearButtonMutation();
+    @try {
+        block();
+    } @finally {
+        DYYYEndClearButtonMutation();
+    }
+}
 
 
 HideUIButton *hideButton;
@@ -49,26 +76,60 @@ UIWindow *getKeyWindow(void) {
     return keyWindow;
 }
 
-void updateClearButtonVisibility() {
-    if (!hideButton || !isAppActive)
+static void DYYYApplyClearButtonHiddenState(HideUIButton *button, BOOL hidden) {
+    if (!button) {
         return;
-
-    __weak HideUIButton *weakButton = hideButton;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        HideUIButton *strongButton = weakButton;
-        if (!strongButton) {
+    }
+    void (^applyBlock)(HideUIButton *) = ^(HideUIButton *target) {
+        if (!target) {
             return;
         }
-        if (!dyyyInteractionViewVisible) {
-            strongButton.hidden = YES;
-            return;
+        if (target.hidden != hidden) {
+            target.hidden = hidden;
         }
+    };
 
-        BOOL shouldHide = dyyyCommentViewVisible || clearButtonForceHidden || isPureViewVisible;
-        if (strongButton.hidden != shouldHide) {
-            strongButton.hidden = shouldHide;
+    if ([NSThread isMainThread]) {
+        applyBlock(button);
+    } else {
+        __weak HideUIButton *weakButton = button;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            applyBlock(weakButton);
+        });
+    }
+}
+
+static BOOL DYYYShouldHideClearButton(void) {
+    BOOL clearModeActive = (hideButton && hideButton.isElementsHidden);
+    if (clearModeActive) {
+        if (!isAppActive) {
+            return YES;
         }
-    });
+        return clearButtonForceHidden;
+    }
+    if (!isAppActive) {
+        return YES;
+    }
+    if (!dyyyInteractionViewVisible) {
+        return YES;
+    }
+    if (dyyyCommentViewVisible) {
+        return YES;
+    }
+    if (isPureViewVisible) {
+        return YES;
+    }
+    if (clearButtonForceHidden) {
+        return YES;
+    }
+    return NO;
+}
+
+void updateClearButtonVisibility() {
+    if (!hideButton) {
+        return;
+    }
+    DYYYApplyClearButtonHiddenState(hideButton, DYYYShouldHideClearButton());
 }
 
 void showClearButton(void) {
@@ -78,37 +139,30 @@ void showClearButton(void) {
 
 void hideClearButton(void) {
     clearButtonForceHidden = YES;
-    if (hideButton) {
-        __weak HideUIButton *weakButton = hideButton;
-        dispatch_async(dispatch_get_main_queue(), ^{
-            HideUIButton *strongButton = weakButton;
-            if (!strongButton) {
-                return;
-            }
-            strongButton.hidden = YES;
-        });
-    }
+    updateClearButtonVisibility();
 }
 
 static void forceResetAllUIElements(void) {
-    UIWindow *window = getKeyWindow();
-    if (!window)
-        return;
-    Class StackViewClass = NSClassFromString(@"AWEElementStackView");
-    for (NSString *className in targetClassNames) {
-        Class viewClass = NSClassFromString(className);
-        if (!viewClass)
-            continue;
-        NSMutableArray *views = [NSMutableArray array];
-        findViewsOfClassHelper(window, viewClass, views);
-        for (UIView *view in views) {
-            if ([view isKindOfClass:StackViewClass]) {
-                view.alpha = DYGetGlobalAlpha();
-            } else {
-                view.alpha = 1.0; // 恢复透明度
+    DYYYPerformClearButtonMutation(^{
+        UIWindow *window = getKeyWindow();
+        if (!window)
+            return;
+        Class StackViewClass = NSClassFromString(@"AWEElementStackView");
+        for (NSString *className in targetClassNames) {
+            Class viewClass = NSClassFromString(className);
+            if (!viewClass)
+                continue;
+            NSMutableArray *views = [NSMutableArray array];
+            findViewsOfClassHelper(window, viewClass, views);
+            for (UIView *view in views) {
+                if ([view isKindOfClass:StackViewClass]) {
+                    view.alpha = DYGetGlobalAlpha();
+                } else {
+                    view.alpha = 1.0; // 恢复透明度
+                }
             }
         }
-    }
+    });
 }
 static void reapplyHidingToAllElements(HideUIButton *button) {
     if (!button || !button.isElementsHidden)
@@ -415,9 +469,11 @@ void initTargetClassNames(void) {
 
 - (void)restoreAWEPlayInteractionProgressContainerView {
     if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DYYYRemoveTimeProgress"] || [[NSUserDefaults standardUserDefaults] boolForKey:@"DYYYHideTimeProgress"]) {
-        for (UIWindow *window in [UIApplication sharedApplication].windows) {
-            [self recursivelyRestoreAWEPlayInteractionProgressContainerViewInView:window];
-        }
+        DYYYPerformClearButtonMutation(^{
+            for (UIWindow *window in [UIApplication sharedApplication].windows) {
+                [self recursivelyRestoreAWEPlayInteractionProgressContainerViewInView:window];
+            }
+        });
     }
 }
 
@@ -450,15 +506,17 @@ void initTargetClassNames(void) {
     }
 }
 - (void)hideUIElements {
-    [self.hiddenViewsList removeAllObjects];
-    [self findAndHideViews:targetClassNames];
-    [self hideAWEPlayInteractionProgressContainerView];
-    self.isElementsHidden = YES;
-    // self.hidden should be managed by updateClearButtonVisibility
-    updateClearButtonVisibility();
-    if (self.superview) {
-        [self.superview bringSubviewToFront:self];
-    }
+    DYYYPerformClearButtonMutation(^{
+        [self.hiddenViewsList removeAllObjects];
+        [self findAndHideViews:targetClassNames];
+        [self hideAWEPlayInteractionProgressContainerView];
+        self.isElementsHidden = YES;
+        // self.hidden should be managed by updateClearButtonVisibility
+        updateClearButtonVisibility();
+        if (self.superview) {
+            [self.superview bringSubviewToFront:self];
+        }
+    });
 }
 
 - (void)hideAWEPlayInteractionProgressContainerView {

DYYYFloatSpeedButton.m

@@ -1,4 +1,5 @@
 #import "AwemeHeaders.h"
+#import "DYYYFloatClearButton.h"
 #import "DYYYFloatSpeedButton.h"
 #import "DYYYUtils.h"
 #import <UIKit/UIKit.h>
@@ -14,6 +15,50 @@
 BOOL speedButtonForceHidden = NO;
 BOOL dyyyInteractionViewVisible = NO;
 
+static void DYYYApplySpeedButtonHiddenState(UIView *button, BOOL hidden) {
+    if (!button) {
+        return;
+    }
+    void (^applyBlock)(UIView *) = ^(UIView *target) {
+        if (!target) {
+            return;
+        }
+        if (target.hidden != hidden) {
+            target.hidden = hidden;
+        }
+    };
+
+    if ([NSThread isMainThread]) {
+        applyBlock(button);
+    } else {
+        __weak UIView *weakButton = button;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            applyBlock(weakButton);
+        });
+    }
+}
+
+static BOOL DYYYShouldHideSpeedButton(void) {
+    BOOL clearModeActive = (hideButton && hideButton.isElementsHidden);
+    if (clearModeActive) {
+        BOOL hideSpeedInClearMode = [[NSUserDefaults standardUserDefaults] boolForKey:@"DYYYHideSpeed"];
+        if (hideSpeedInClearMode) {
+            return YES;
+        }
+        return speedButtonForceHidden;
+    }
+    if (!dyyyInteractionViewVisible) {
+        return YES;
+    }
+    if (dyyyCommentViewVisible) {
+        return YES;
+    }
+    if (speedButtonForceHidden) {
+        return YES;
+    }
+    return NO;
+}
+
 NSArray *getSpeedOptions() {
     NSString *speedConfig = [[NSUserDefaults standardUserDefaults] stringForKey:@"DYYYSpeedSettings"] ?: @"1.0,1.25,1.5,2.0";
     return [speedConfig componentsSeparatedByString:@","];
@@ -106,61 +151,21 @@ void updateSpeedButtonUI() {
     return viewControllers;
 }
 
-void showSpeedButton(void) { speedButtonForceHidden = NO; }
+void showSpeedButton(void) {
+    speedButtonForceHidden = NO;
+    updateSpeedButtonVisibility();
+}
 
 void hideSpeedButton(void) {
     speedButtonForceHidden = YES;
-    if (speedButton) {
-        if ([NSThread isMainThread]) {
-            speedButton.hidden = YES;
-        } else {
-            __weak FloatingSpeedButton *weakButton = speedButton;
-            dispatch_async(dispatch_get_main_queue(), ^{
-              FloatingSpeedButton *strongButton = weakButton;
-              if (!strongButton) {
-                  return;
-              }
-              strongButton.hidden = YES;
-            });
-        }
-    }
+    updateSpeedButtonVisibility();
 }
 
 void updateSpeedButtonVisibility() {
     if (!speedButton || !isFloatSpeedButtonEnabled)
         return;
 
-    // 如果已经在主线程，直接执行；否则异步到主线程
-    if ([NSThread isMainThread]) {
-        if (!dyyyInteractionViewVisible) {
-            speedButton.hidden = YES;
-            return;
-        }
-
-        // 在交互界面时，根据评论界面状态决定是否显示
-        BOOL shouldHide = dyyyCommentViewVisible || speedButtonForceHidden;
-        if (speedButton.hidden != shouldHide) {
-            speedButton.hidden = shouldHide;
-        }
-    } else {
-        __weak FloatingSpeedButton *weakButton = speedButton;
-        dispatch_async(dispatch_get_main_queue(), ^{
-          FloatingSpeedButton *strongButton = weakButton;
-          if (!strongButton) {
-              return;
-          }
-          if (!dyyyInteractionViewVisible) {
-              strongButton.hidden = YES;
-              return;
-          }
-
-          // 在交互界面时，根据评论界面状态决定是否显示
-          BOOL shouldHide = dyyyCommentViewVisible || speedButtonForceHidden;
-          if (strongButton.hidden != shouldHide) {
-              strongButton.hidden = shouldHide;
-          }
-        });
-    }
+    DYYYApplySpeedButtonHiddenState(speedButton, DYYYShouldHideSpeedButton());
 }
 
 @implementation FloatingSpeedButton