Skip to content

Commit bfd8e32

Browse files
author
Jasper
committed
修改
1 parent efc6edd commit bfd8e32

File tree

8 files changed

+207
-24
lines changed

8 files changed

+207
-24
lines changed

CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
A3636A8A1ED297D200B0F8E9 /* CycleBannerViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3636A891ED297D200B0F8E9 /* CycleBannerViewItem.swift */; };
2727
A3636A9E1ED2C77800B0F8E9 /* CycleBannerTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3636A9D1ED2C77800B0F8E9 /* CycleBannerTestViewController.swift */; };
2828
A3636AAC1ED31E7600B0F8E9 /* RedPacketViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3636AAB1ED31E7600B0F8E9 /* RedPacketViewController.swift */; };
29+
A3636B0B1ED52BAA00B0F8E9 /* RedPacketAssets.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A3636B0A1ED52BAA00B0F8E9 /* RedPacketAssets.bundle */; };
2930
A38580201DEFCFA800FF989F /* CYLineProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = A385801F1DEFCFA800FF989F /* CYLineProgressBar.swift */; };
3031
A38580221DEFD1E900FF989F /* CYArcProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = A38580211DEFD1E900FF989F /* CYArcProgressBar.swift */; };
3132
A38580241DEFF6E100FF989F /* CYCycleProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = A38580231DEFF6E100FF989F /* CYCycleProgressBar.swift */; };
@@ -70,6 +71,7 @@
7071
A3636A891ED297D200B0F8E9 /* CycleBannerViewItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CycleBannerViewItem.swift; sourceTree = "<group>"; };
7172
A3636A9D1ED2C77800B0F8E9 /* CycleBannerTestViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CycleBannerTestViewController.swift; sourceTree = "<group>"; };
7273
A3636AAB1ED31E7600B0F8E9 /* RedPacketViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RedPacketViewController.swift; sourceTree = "<group>"; };
74+
A3636B0A1ED52BAA00B0F8E9 /* RedPacketAssets.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = RedPacketAssets.bundle; sourceTree = "<group>"; };
7375
A385801F1DEFCFA800FF989F /* CYLineProgressBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CYLineProgressBar.swift; sourceTree = "<group>"; };
7476
A38580211DEFD1E900FF989F /* CYArcProgressBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CYArcProgressBar.swift; sourceTree = "<group>"; };
7577
A38580231DEFF6E100FF989F /* CYCycleProgressBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CYCycleProgressBar.swift; sourceTree = "<group>"; };
@@ -233,6 +235,7 @@
233235
A385A69C1ED138810022C2EB /* CYRedPacketUI */ = {
234236
isa = PBXGroup;
235237
children = (
238+
A3636B0A1ED52BAA00B0F8E9 /* RedPacketAssets.bundle */,
236239
A385A6AA1ED16A710022C2EB /* ViewModel */,
237240
A385A6A01ED13BD10022C2EB /* UIWindow+CYRedPacket.swift */,
238241
A385A6A21ED13C220022C2EB /* CYRedPacketOpenView.swift */,
@@ -350,6 +353,7 @@
350353
isa = PBXResourcesBuildPhase;
351354
buildActionMask = 2147483647;
352355
files = (
356+
A3636B0B1ED52BAA00B0F8E9 /* RedPacketAssets.bundle in Resources */,
353357
61091D681CDAF8E4008B7EA3 /* LaunchScreen.storyboard in Resources */,
354358
61091D651CDAF8E4008B7EA3 /* Assets.xcassets in Resources */,
355359
61091D631CDAF8E4008B7EA3 /* Main.storyboard in Resources */,

CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift/Test/CycleBannerTestViewController.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,9 @@ class CycleBannerTestViewController: UIViewController, CycleBannerViewDataSource
8787
item.transform = CGAffineTransform(scaleX: scale, y: scale)
8888
}
8989

90+
func cycleBannerView(cycleBannerView: CycleBannerView, didSelectItemAt index: UInt) {
91+
92+
print("tap item at = %d", index)
93+
}
94+
9095
}

CYUtilProjectSwift/CYUtilProjectSwift/CYUtilProjectSwift/Test/RedPacketViewController.swift

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,20 @@ class RedPacketViewController: UIViewController, CYRedPacketOpenViewDelegate {
2424
}
2525

2626
func openPacket(sender: Any) {
27-
let view = CYRedPacketOpenView(frame: CGRect(x: 100, y: 100, width: 200, height: 500))
28-
view.backgroundColor = UIColor.green
29-
view.backgroundView.backgroundColor = UIColor.cyan
30-
view.closeButton.backgroundColor = UIColor.red
31-
view.headImageButton.backgroundColor = UIColor.red
32-
view.nicknameButton.backgroundColor = UIColor.black
33-
view.openButton.backgroundColor = UIColor.blue
34-
view.detailButton.backgroundColor = UIColor.brown
35-
view.blessingLabel.backgroundColor = UIColor.white
36-
view.receiveTipsLabel.backgroundColor = UIColor.red
27+
let view = CYRedPacketOpenView(frame: CGRect(x: 100, y: 100, width: 200, height: 350))
28+
// view.backgroundColor = UIColor.green
29+
// view.backgroundView.backgroundColor = UIColor.cyan
30+
// view.closeButton.backgroundColor = UIColor.red
31+
// view.headImageButton.backgroundColor = UIColor.red
32+
// view.nicknameButton.backgroundColor = UIColor.black
33+
view.nicknameButton.setTitle("发大幅度", for: .normal)
34+
// view.openButton.backgroundColor = UIColor.blue
35+
// view.detailButton.backgroundColor = UIColor.brown
36+
view.detailButton.setTitle("发大幅度fdd", for: .normal)
37+
// view.blessingLabel.backgroundColor = UIColor.white
38+
view.blessingLabel.text = "发发发范德萨范德萨"
39+
// view.receiveTipsLabel.backgroundColor = UIColor.red
40+
view.receiveTipsLabel.text = "发发发范德萨范德萨"
3741
view.delegate = self
3842

3943
window = UIWindow(frame: UIScreen.main.bounds)

CYUtilProjectSwift/CYUtilProjectSwift/CYUtils/CYAlertWindow/UIWindow+CYAlertWindow.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ extension UIWindow {
2424

2525
func dismiss_cyalert() {
2626

27-
UIView.animate(withDuration: 0.3,
27+
UIView.animate(withDuration: 0.1,
2828
animations: {
2929

3030
self.backgroundColor = UIColor.clear

0 commit comments

Comments
 (0)