From 38e57275e746770687e0139921d064b68a9ecd37 Mon Sep 17 00:00:00 2001 From: lang Date: Sat, 28 Apr 2018 17:25:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=95=B0=E7=BB=84=E4=B8=AD=E6=9C=89=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes .../UserInterfaceState.xcuserstate | Bin 0 -> 10440 bytes .../xcschemes/xcschememanagement.plist | 14 ++++++++++++++ AutoAdLabelScroll/HRAdView.m | 12 ++++++++---- 4 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 .DS_Store create mode 100644 AutoAdLabelScroll.xcodeproj/project.xcworkspace/xcuserdata/lang.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 AutoAdLabelScroll.xcodeproj/xcuserdata/lang.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4ec6482a834a94a3da09aae65d3e8ae5abbad3ed GIT binary patch literal 6148 zcmeHK&2G~`5T0#Av1ue+i9-+^EOFoxp|q)5j&7RXDuHlB5Bvl>wi;I(ujSYcQWVL3 z0UiLjA%5Ni-T{uh07vf3&Mtx~AW(&(3hhWU-+Fdt*83^m%>V%Fl+ikX0{|AP#M&h^ zzYsYubxxMFX9bZ_jU9+!9|8y=o{KgP!+>GnyfGlZ-8I;O5(*HAKfYfMJ`5m7F9#k@ z##zWkh|yoej3?uw)%wJimTMPQE?Ty|TCdkH*B|*qG4YF_D94>3e;}Xk2E{N8^1gH3 zPofw{2T4>6dvUtQGpQ3>29{SW;5Hmdb54+@zKe% z=PzEqe)IO-drAU^#~8_)#_#X}2Y*4+v7e`0q=y(SD_#3Dv2Y8XBFzGck0B$vkNDxb zKMhz4T} I0}Ex~8v!h&-2eap literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bec297dc2a85e2e8872bdb38d61e845447337cda GIT binary patch literal 10440 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 literal 0 HcmV?d00001 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 + From bc0d7928973287aaa5c0891435baa44470438050 Mon Sep 17 00:00:00 2001 From: stayRealLang Date: Sat, 28 Apr 2018 17:38:15 +0800 Subject: [PATCH 2/2] Delete .DS_Store --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 4ec6482a834a94a3da09aae65d3e8ae5abbad3ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&2G~`5T0#Av1ue+i9-+^EOFoxp|q)5j&7RXDuHlB5Bvl>wi;I(ujSYcQWVL3 z0UiLjA%5Ni-T{uh07vf3&Mtx~AW(&(3hhWU-+Fdt*83^m%>V%Fl+ikX0{|AP#M&h^ zzYsYubxxMFX9bZ_jU9+!9|8y=o{KgP!+>GnyfGlZ-8I;O5(*HAKfYfMJ`5m7F9#k@ z##zWkh|yoej3?uw)%wJimTMPQE?Ty|TCdkH*B|*qG4YF_D94>3e;}Xk2E{N8^1gH3 zPofw{2T4>6dvUtQGpQ3>29{SW;5Hmdb54+@zKe% z=PzEqe)IO-drAU^#~8_)#_#X}2Y*4+v7e`0q=y(SD_#3Dv2Y8XBFzGck0B$vkNDxb zKMhz4T} I0}Ex~8v!h&-2eap