Skip to content

Commit 0fb6a2c

Browse files
committed
回滚解决部分人卡死
1 parent 66facf1 commit 0fb6a2c

File tree

1 file changed

+8
-26
lines changed

1 file changed

+8
-26
lines changed

DYYY.xm

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4837,8 +4837,8 @@ static void *TabBarHeightObservationContext = &TabBarHeightObservationContext;
48374837
[[NSUserDefaults standardUserDefaults] removeObserver:self forKeyPath:TabBarHeightKey context:TabBarHeightObservationContext];
48384838
} @catch (NSException *exception) {
48394839
NSLog(@"[DYYY] KVO removeObserver failed: %@", exception);
4840-
}
4841-
%orig;
4840+
} @
4841+
logosformatorig;
48424842
}
48434843

48444844
%new
@@ -5551,39 +5551,21 @@ static void *TabBarHeightObservationContext = &TabBarHeightObservationContext;
55515551
}
55525552

55535553
if (isPlayVC && enableFS) {
5554-
if (dyyyCommentViewVisible) {
5555-
%orig(frame);
5556-
return;
5557-
}
5558-
5559-
if (fabs(frame.origin.x) > 0.1 || fabs(frame.origin.y) > 0.1) {
5560-
%orig(frame);
5561-
return;
5562-
}
5563-
5564-
UIView *superView = self.superview;
5565-
if (!superView) {
5554+
if (frame.origin.x != 0 && frame.origin.y != 0) {
55665555
%orig(frame);
55675556
return;
55685557
}
5569-
5570-
CGFloat superHeight = CGRectGetHeight(superView.bounds);
5571-
CGFloat frameHeight = CGRectGetHeight(frame);
5572-
CGFloat frameWidth = CGRectGetWidth(frame);
5573-
5574-
if (superHeight > 0 && frameHeight > 0 && frameHeight < superHeight) {
5575-
CGFloat diff = superHeight - frameHeight;
5576-
BOOL isLandscapeFrame = (frameWidth > frameHeight);
5577-
5578-
if (!isLandscapeFrame && fabs(diff - tabHeight) < 1.0) {
5579-
frame.size.height = superHeight;
5558+
CGRect superF = self.superview.frame;
5559+
if (CGRectGetHeight(superF) > 0 && CGRectGetHeight(frame) > 0 && CGRectGetHeight(frame) < CGRectGetHeight(superF)) {
5560+
CGFloat diff = CGRectGetHeight(superF) - CGRectGetHeight(frame);
5561+
if (fabs(diff - tabHeight) < 1.0) {
5562+
frame.size.height = CGRectGetHeight(superF);
55805563
}
55815564
}
55825565

55835566
%orig(frame);
55845567
return;
55855568
}
5586-
55875569
%orig(frame);
55885570
}
55895571

0 commit comments

Comments
 (0)