diff --git a/AutoAdLabelScroll.xcodeproj/project.xcworkspace/xcuserdata/lang.xcuserdatad/UserInterfaceState.xcuserstate b/AutoAdLabelScroll.xcodeproj/project.xcworkspace/xcuserdata/lang.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..bec297d Binary files /dev/null and b/AutoAdLabelScroll.xcodeproj/project.xcworkspace/xcuserdata/lang.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/AutoAdLabelScroll.xcodeproj/xcuserdata/lang.xcuserdatad/xcschemes/xcschememanagement.plist b/AutoAdLabelScroll.xcodeproj/xcuserdata/lang.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..2c6e826 --- /dev/null +++ b/AutoAdLabelScroll.xcodeproj/xcuserdata/lang.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + AutoAdLabelScroll.xcscheme + + orderHint + 0 + + + + diff --git a/AutoAdLabelScroll/HRAdView.m b/AutoAdLabelScroll/HRAdView.m index 59e3063..3cbc24e 100644 --- a/AutoAdLabelScroll/HRAdView.m +++ b/AutoAdLabelScroll/HRAdView.m @@ -9,7 +9,8 @@ #import "HRAdView.h" #define ViewWidth self.bounds.size.width #define ViewHeight self.bounds.size.height - +#define CurrentTag 111 +#define HiddenTag 222 @interface HRAdView () /** @@ -98,12 +99,11 @@ - (void)timeRepeat { __block UILabel *currentLabel; __block UILabel *hidenLabel; - __weak typeof(self) weakself = self; [self.subviews enumerateObjectsUsingBlock:^(__kindof UIView * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) { if ([obj isKindOfClass:[UILabel class]]) { UILabel *label = obj; - NSString *string = weakself.adTitles[index]; - if ([label.text isEqualToString:string]) { + + if (label.tag == HiddenTag) { currentLabel = label; }else{ hidenLabel = label; @@ -123,6 +123,8 @@ - (void)timeRepeat { currentLabel.frame = CGRectMake(margin, -ViewHeight, ViewWidth - margin, ViewHeight); } completion:^(BOOL finished) { currentLabel.frame = CGRectMake(margin, ViewHeight, ViewWidth - margin, ViewHeight); + currentLabel.tag = CurrentTag; + hidenLabel.tag = HiddenTag; }]; } @@ -146,6 +148,7 @@ - (void)layoutSubviews { } self.oneLabel.frame = CGRectMake(margin, 0, ViewWidth - margin, ViewHeight); + self.oneLabel.tag = HiddenTag; self.twoLabel.frame = CGRectMake(margin, ViewHeight, ViewWidth - margin, ViewHeight); } @@ -239,3 +242,4 @@ - (void)clickEvent:(UITapGestureRecognizer *)tapGestureRecognizer { @end +