Skip to content

Commit 50198bd

Browse files
author
Jasper
committed
【add】增加ImageBanner
【修改】修改原banner名
1 parent 90c8663 commit 50198bd

File tree

8 files changed

+473
-132
lines changed

8 files changed

+473
-132
lines changed

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift.xcodeproj/project.pbxproj

+24-16
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,6 @@
6565
A3D086FD1EEE3B47007752ED /* HerizontalTableViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3D086FC1EEE3B47007752ED /* HerizontalTableViewItem.swift */; };
6666
A3DEB59E1E66C89F000B6001 /* CYWebViewProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3DEB59D1E66C89F000B6001 /* CYWebViewProgress.swift */; };
6767
A3E2530A1CFD976F002F8E18 /* ObjectiveCTestObject.m in Sources */ = {isa = PBXBuildFile; fileRef = A3E253091CFD976F002F8E18 /* ObjectiveCTestObject.m */; };
68-
A3EB573A1FA1D41D00A58278 /* CycleBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3EB57381FA1D41D00A58278 /* CycleBannerView.swift */; };
69-
A3EB573B1FA1D41D00A58278 /* CycleBannerViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3EB57391FA1D41D00A58278 /* CycleBannerViewItem.swift */; };
7068
A3FDF5BD1F8B2432009E5F68 /* DeviceAuthentication.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FDF5BC1F8B2432009E5F68 /* DeviceAuthentication.swift */; };
7169
A3FDF5BF1F8CA2AB009E5F68 /* DeviceAuthenticationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3FDF5BE1F8CA2AB009E5F68 /* DeviceAuthenticationTests.swift */; };
7270
A41FB26E1FE8E58F00A75434 /* QRCodeGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A41FB26D1FE8E58F00A75434 /* QRCodeGenerator.swift */; };
@@ -94,6 +92,10 @@
9492
A49088AA2046538600FF8526 /* home_header_recharge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A49088A42046538500FF8526 /* home_header_recharge@2x.png */; };
9593
A49088AC2046B61800FF8526 /* SingleImageGalleryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A49088AB2046B61800FF8526 /* SingleImageGalleryView.swift */; };
9694
A49088AE2046B9F400FF8526 /* SingleImageGalleryTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A49088AD2046B9F400FF8526 /* SingleImageGalleryTestViewController.swift */; };
95+
A49088B22047AA3D00FF8526 /* BannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A49088B02047AA3D00FF8526 /* BannerView.swift */; };
96+
A49088B32047AA3D00FF8526 /* BannerViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A49088B12047AA3D00FF8526 /* BannerViewItem.swift */; };
97+
A49088B52047AE7000FF8526 /* ImageBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A49088B42047AE7000FF8526 /* ImageBannerView.swift */; };
98+
A49088B72047EBD700FF8526 /* ImageBannerTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A49088B62047EBD700FF8526 /* ImageBannerTestViewController.swift */; };
9799
/* End PBXBuildFile section */
98100

99101
/* Begin PBXContainerItemProxy section */
@@ -184,8 +186,6 @@
184186
A3E253071CFD976F002F8E18 /* CYUtilProjectSwift-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CYUtilProjectSwift-Bridging-Header.h"; sourceTree = "<group>"; };
185187
A3E253081CFD976F002F8E18 /* ObjectiveCTestObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectiveCTestObject.h; sourceTree = "<group>"; };
186188
A3E253091CFD976F002F8E18 /* ObjectiveCTestObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjectiveCTestObject.m; sourceTree = "<group>"; };
187-
A3EB57381FA1D41D00A58278 /* CycleBannerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CycleBannerView.swift; sourceTree = "<group>"; };
188-
A3EB57391FA1D41D00A58278 /* CycleBannerViewItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CycleBannerViewItem.swift; sourceTree = "<group>"; };
189189
A3FDF5BC1F8B2432009E5F68 /* DeviceAuthentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceAuthentication.swift; sourceTree = "<group>"; };
190190
A3FDF5BE1F8CA2AB009E5F68 /* DeviceAuthenticationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceAuthenticationTests.swift; sourceTree = "<group>"; };
191191
A41FB26D1FE8E58F00A75434 /* QRCodeGenerator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRCodeGenerator.swift; sourceTree = "<group>"; };
@@ -213,6 +213,10 @@
213213
A49088A42046538500FF8526 /* home_header_recharge@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "home_header_recharge@2x.png"; sourceTree = "<group>"; };
214214
A49088AB2046B61800FF8526 /* SingleImageGalleryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleImageGalleryView.swift; sourceTree = "<group>"; };
215215
A49088AD2046B9F400FF8526 /* SingleImageGalleryTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleImageGalleryTestViewController.swift; sourceTree = "<group>"; };
216+
A49088B02047AA3D00FF8526 /* BannerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BannerView.swift; sourceTree = "<group>"; };
217+
A49088B12047AA3D00FF8526 /* BannerViewItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BannerViewItem.swift; sourceTree = "<group>"; };
218+
A49088B42047AE7000FF8526 /* ImageBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageBannerView.swift; sourceTree = "<group>"; };
219+
A49088B62047EBD700FF8526 /* ImageBannerTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageBannerTestViewController.swift; sourceTree = "<group>"; };
216220
/* End PBXFileReference section */
217221

218222
/* Begin PBXFrameworksBuildPhase section */
@@ -293,14 +297,14 @@
293297
61091D6F1CDAFCB0008B7EA3 /* CYUtils */ = {
294298
isa = PBXGroup;
295299
children = (
300+
A49088AF2047AA3D00FF8526 /* Banner */,
296301
A490889A20463F8700FF8526 /* ImageGallery */,
297302
A47DF9B7201076AE000D32D3 /* Encrypt */,
298303
A41FB26C1FE8E56400A75434 /* QRCode */,
299304
A4874DFC1FE2793B002C978F /* SimpleTableView */,
300305
A4482EDF1FE26B95004B8771 /* MVVM */,
301306
A34F78481FBC28AB00A3D895 /* HTTPUtils */,
302307
A39A31631FB03B9800CAC143 /* Model */,
303-
A3EB57371FA1D41D00A58278 /* CycleBanner */,
304308
A3FDF5BB1F8B2420009E5F68 /* DeviceAuth */,
305309
A36B94361F4E7F4F00F14AAB /* CYAnimation */,
306310
A36B942D1F4ABBE600F14AAB /* EventListener */,
@@ -514,6 +518,7 @@
514518
A47DF9B3201039F9000D32D3 /* PresentationStyleTestViewController.swift */,
515519
A490889D2046530800FF8526 /* ImageGalleryTestViewController.swift */,
516520
A49088AD2046B9F400FF8526 /* SingleImageGalleryTestViewController.swift */,
521+
A49088B62047EBD700FF8526 /* ImageBannerTestViewController.swift */,
517522
);
518523
path = Test;
519524
sourceTree = "<group>";
@@ -537,15 +542,6 @@
537542
path = HerizontalTable;
538543
sourceTree = "<group>";
539544
};
540-
A3EB57371FA1D41D00A58278 /* CycleBanner */ = {
541-
isa = PBXGroup;
542-
children = (
543-
A3EB57381FA1D41D00A58278 /* CycleBannerView.swift */,
544-
A3EB57391FA1D41D00A58278 /* CycleBannerViewItem.swift */,
545-
);
546-
path = CycleBanner;
547-
sourceTree = "<group>";
548-
};
549545
A3FDF5BB1F8B2420009E5F68 /* DeviceAuth */ = {
550546
isa = PBXGroup;
551547
children = (
@@ -596,6 +592,16 @@
596592
path = ImageGallery;
597593
sourceTree = "<group>";
598594
};
595+
A49088AF2047AA3D00FF8526 /* Banner */ = {
596+
isa = PBXGroup;
597+
children = (
598+
A49088B02047AA3D00FF8526 /* BannerView.swift */,
599+
A49088B12047AA3D00FF8526 /* BannerViewItem.swift */,
600+
A49088B42047AE7000FF8526 /* ImageBannerView.swift */,
601+
);
602+
path = Banner;
603+
sourceTree = "<group>";
604+
};
599605
/* End PBXGroup section */
600606

601607
/* Begin PBXNativeTarget section */
@@ -769,6 +775,7 @@
769775
buildActionMask = 2147483647;
770776
files = (
771777
A30EA3D21CFED40F006FEF23 /* CYAudioPlayUtils.swift in Sources */,
778+
A49088B22047AA3D00FF8526 /* BannerView.swift in Sources */,
772779
A4482EE11FE26BAB004B8771 /* BaseViewModel.swift in Sources */,
773780
A36B94401F4E815D00F14AAB /* AnimatedImageTestViewController.swift in Sources */,
774781
A36B943B1F4E7F8900F14AAB /* CYAnimatedImageView.swift in Sources */,
@@ -784,21 +791,23 @@
784791
A36B94421F4EB0F200F14AAB /* AnimationLayer.swift in Sources */,
785792
61091D601CDAF8E4008B7EA3 /* ViewController.swift in Sources */,
786793
A3636A9E1ED2C77800B0F8E9 /* CycleBannerTestViewController.swift in Sources */,
794+
A49088B72047EBD700FF8526 /* ImageBannerTestViewController.swift in Sources */,
787795
A38580221DEFD1E900FF989F /* CYArcProgressBar.swift in Sources */,
788796
A3FDF5BD1F8B2432009E5F68 /* DeviceAuthentication.swift in Sources */,
789797
A30EA3D41CFEE023006FEF23 /* CYAudioRecordUtils.swift in Sources */,
798+
A49088B52047AE7000FF8526 /* ImageBannerView.swift in Sources */,
790799
A3D086FD1EEE3B47007752ED /* HerizontalTableViewItem.swift in Sources */,
791800
A38580241DEFF6E100FF989F /* CYCycleProgressBar.swift in Sources */,
792801
A3CCAF311D17A56000A40969 /* CYJSJSONParametersSerialization.swift in Sources */,
793802
A37D5B481ED7037500A63AB9 /* SendRedPacketView.swift in Sources */,
794803
A39A31651FB03BCF00CAC143 /* BaseModel.swift in Sources */,
795804
A4874E001FE2797B002C978F /* SimpleTableViewCell.swift in Sources */,
796805
A37D5B461ED7036200A63AB9 /* SendRedPacketViewController.swift in Sources */,
797-
A3EB573B1FA1D41D00A58278 /* CycleBannerViewItem.swift in Sources */,
798806
A3B7009B1E1B500B00823B7B /* ProgressWebTestViewController.swift in Sources */,
799807
A32F8C9B1F31C0AA003BA93B /* FloatingView.swift in Sources */,
800808
A33913D11CF4236800C8C147 /* CYJSONUtils.swift in Sources */,
801809
A3636AAC1ED31E7600B0F8E9 /* RedPacketViewController.swift in Sources */,
810+
A49088B32047AA3D00FF8526 /* BannerViewItem.swift in Sources */,
802811
61091D721CDAFCDA008B7EA3 /* ImageDownloader.swift in Sources */,
803812
A32F8C9F1F31CBC2003BA93B /* FloatingViewTestViewController.swift in Sources */,
804813
A3CCAF331D17A57900A40969 /* CYJSParametersSerialization.swift in Sources */,
@@ -830,7 +839,6 @@
830839
A385A6A71ED1585B0022C2EB /* CYRedPacketDetailCell.swift in Sources */,
831840
A49088AE2046B9F400FF8526 /* SingleImageGalleryTestViewController.swift in Sources */,
832841
A3BA5F1C1E67ED8200B31B8C /* CYProgressWebViewController.swift in Sources */,
833-
A3EB573A1FA1D41D00A58278 /* CycleBannerView.swift in Sources */,
834842
A4874DFF1FE2797B002C978F /* SimpleTableView.swift in Sources */,
835843
A33E4B3D1D06ABDC001B0AB1 /* CYJSCommonActionRequestUtils.swift in Sources */,
836844
A385A69F1ED138EA0022C2EB /* UIWindow+CYAlertWindow.swift in Sources */,

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift/Base.lproj/Main.storyboard

+17
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,23 @@
240240
</subviews>
241241
</tableViewCellContentView>
242242
</tableViewCell>
243+
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="PD0-OE-WKL">
244+
<rect key="frame" x="0.0" y="528" width="375" height="44"/>
245+
<autoresizingMask key="autoresizingMask"/>
246+
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PD0-OE-WKL" id="0ri-rl-oZM">
247+
<rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
248+
<autoresizingMask key="autoresizingMask"/>
249+
<subviews>
250+
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="ImageBanner" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8fQ-d0-6HH">
251+
<rect key="frame" x="24" y="11" width="323" height="21"/>
252+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
253+
<fontDescription key="fontDescription" type="system" pointSize="17"/>
254+
<nil key="textColor"/>
255+
<nil key="highlightedColor"/>
256+
</label>
257+
</subviews>
258+
</tableViewCellContentView>
259+
</tableViewCell>
243260
</cells>
244261
</tableViewSection>
245262
</sections>

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift/Test/CycleBannerTestViewController.swift

+9-9
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public protocol TextProtocol {
1313
func testSomething()
1414
}
1515

16-
class CycleBannerTestViewController: UIViewController, CycleBannerViewDelegate, TextProtocol {
16+
class CycleBannerTestViewController: UIViewController, BannerViewDelegate, TextProtocol {
1717

1818

1919
func testSomething() {
2020

2121
}
2222

2323

24-
var cycleBannerView: CycleBannerView!
24+
var cycleBannerView: BannerView!
2525

2626
override func loadView() {
2727
super.loadView()
@@ -30,7 +30,7 @@ class CycleBannerTestViewController: UIViewController, CycleBannerViewDelegate,
3030

3131
self.view.backgroundColor = UIColor.white
3232

33-
cycleBannerView = CycleBannerView(frame: self.view.bounds)
33+
cycleBannerView = BannerView(frame: self.view.bounds)
3434
cycleBannerView.delegate = self
3535
cycleBannerView.itemSize = CGSize(width: 280, height: 180)
3636
cycleBannerView.itemHeaderWidth = 10
@@ -70,12 +70,12 @@ class CycleBannerTestViewController: UIViewController, CycleBannerViewDelegate,
7070

7171
}
7272

73-
func cycleBannerView(_ cycleBannerView: CycleBannerView, didSelectItemAt index: Int) {
73+
func bannerView(_ cycleBannerView: BannerView, didSelectItemAt index: Int) {
7474

7575
print("tap item at = %d", index)
7676
}
7777

78-
func cycleBannerViewDidLayoutItems(_ cycleBannerView: CycleBannerView) {
78+
func bannerViewDidLayoutItems(_ cycleBannerView: BannerView) {
7979

8080
// let scrollView = cycleBannerView.scrollView!
8181
// let contentOffset = scrollView.contentOffset
@@ -110,13 +110,13 @@ class CycleBannerTestViewController: UIViewController, CycleBannerViewDelegate,
110110
@objc func button1Tapped() {
111111

112112

113-
let item1 = CycleBannerViewItem(frame: self.view.bounds)
113+
let item1 = BannerViewItem(frame: self.view.bounds)
114114
item1.contentView.backgroundColor = UIColor.green
115-
let item2 = CycleBannerViewItem()
115+
let item2 = BannerViewItem()
116116
item2.contentView.backgroundColor = UIColor.blue
117-
let item3 = CycleBannerViewItem()
117+
let item3 = BannerViewItem()
118118
item3.contentView.backgroundColor = UIColor.black
119-
let item4 = CycleBannerViewItem()
119+
let item4 = BannerViewItem()
120120
item4.contentView.backgroundColor = UIColor.white
121121
cycleBannerView.items = [item1, item2, item3, item4]
122122
// let item5 = CycleBannerViewItem()

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift/Test/ImageBannerTestViewController.swift

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//
2+
// ImageBannerTestViewController.swift
3+
// CYUtilProjectSwift
4+
//
5+
// Created by Jasper on 01/03/2018.
6+
// Copyright © 2018 Jasper. All rights reserved.
7+
//
8+
9+
import UIKit
10+
11+
class ImageBannerTestViewController: UIViewController {
12+
13+
override func viewDidLoad() {
14+
super.viewDidLoad()
15+
16+
let banner = ImageBannerView(images: [UIImage(named: "home_header_realname_auth")!,
17+
UIImage(named: "home_header_recharge")!,
18+
UIImage(named: "home_header_register")!],
19+
cycleScrolling: true,
20+
frame: CGRect(x: 0, y: 100, width: self.view.bounds.width, height: 300))
21+
self.view.addSubview(banner)
22+
banner.startAutoplay(5)
23+
}
24+
25+
}

‎CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift/ViewController.swift

+3
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ class ViewController: UITableViewController, WKNavigationDelegate, WKUIDelegate
210210
} else if indexPath.row == 11 {
211211
let singleImageGallery = SingleImageGalleryTestViewController()
212212
navigationController?.pushViewController(singleImageGallery, animated: true)
213+
} else if indexPath.row == 12 {
214+
let imageBanner = ImageBannerTestViewController()
215+
navigationController?.pushViewController(imageBanner, animated: true)
213216
}
214217
}
215218
}

0 commit comments

Comments
 (0)