Skip to content

Commit 67651a2

Browse files
author
JmoVxia
committed
fix
1 parent 60aaed0 commit 67651a2

File tree

5 files changed

+26
-35
lines changed

5 files changed

+26
-35
lines changed

CLPlayer.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,10 @@
187187
5BA39B162727D147005059F5 /* CLPlayer */ = {
188188
isa = PBXGroup;
189189
children = (
190+
5B2D28E62729468000E85A53 /* CLImageHelper.swift */,
190191
5BE1F3382727E5780090F6C8 /* CLPlayer.swift */,
191192
5B33B4DD2769EAA20086B402 /* CLPlayerConfigure.swift */,
192193
5B33B4DF2769F2990086B402 /* CLPlayerDelegate.swift */,
193-
5B2D28E62729468000E85A53 /* CLImageHelper.swift */,
194194
5BFADCB9276893B600A596A6 /* CLGCDTimer.swift */,
195195
5BFADCB72768936C00A596A6 /* CLPlayerContentView */,
196196
5BFADCB82768937D00A596A6 /* CLFullScreenController */,

CLPlayer/CLImageHelper.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import UIKit
99

10-
class CLImageHelper: NSObject {
11-
static func imageWithName(_ name: String) -> UIImage? {
10+
public class CLImageHelper: NSObject {
11+
public static func imageWithName(_ name: String) -> UIImage? {
1212
let filePath = Bundle(for: classForCoder()).resourcePath! + "/CLPlayer.bundle"
1313
let bundle = Bundle(path: filePath)
1414
let scale = max(min(Int(UIScreen.main.scale), 2), 3)

CLPlayer/CLPlayerConfigure.swift

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ import UIKit
1111
public struct CLPlayerConfigure {
1212
public struct CLPlayerColor {
1313
/// 顶部工具条背景颜色
14-
public var topToobar = UIColor.black.withAlphaComponent(0.6)
14+
public var topToobar: UIColor
1515
/// 底部工具条背景颜色
16-
public var bottomToolbar = UIColor.black.withAlphaComponent(0.6)
16+
public var bottomToolbar: UIColor
1717
/// 进度条背景颜色
18-
public var progress = UIColor.white.withAlphaComponent(0.35)
18+
public var progress: UIColor
1919
/// 缓冲条缓冲进度颜色
20-
public var progressBuffer = UIColor.white.withAlphaComponent(0.5)
20+
public var progressBuffer: UIColor
2121
/// 进度条播放完成颜色
22-
public var progressFinished = UIColor.white
22+
public var progressFinished: UIColor
2323
/// 转子背景颜色
24-
public var loading = UIColor.white
25-
24+
public var loading: UIColor
25+
2626
public init(topToobar: UIColor = UIColor.black.withAlphaComponent(0.6),
2727
bottomToolbar: UIColor = UIColor.black.withAlphaComponent(0.6),
2828
progress: UIColor = UIColor.white.withAlphaComponent(0.35),
@@ -41,27 +41,27 @@ public struct CLPlayerConfigure {
4141

4242
public struct CLPlayerImage {
4343
/// 返回按钮图片
44-
public var back = CLImageHelper.imageWithName("CLBack")
44+
public var back: UIImage?
4545
/// 更多按钮图片
46-
public var more = CLImageHelper.imageWithName("CLMore")
46+
public var more: UIImage?
4747
/// 播放按钮图片
48-
public var play = CLImageHelper.imageWithName("CLPlay")
48+
public var play: UIImage?
4949
/// 暂停按钮图片
50-
public var pause = CLImageHelper.imageWithName("CLPause")
50+
public var pause: UIImage?
5151
/// 进度滑块图片
52-
public var slider = CLImageHelper.imageWithName("CLSlider")
52+
public var slider: UIImage?
5353
/// 最大化按钮图片
54-
public var max = CLImageHelper.imageWithName("CLFullscreen")
54+
public var max: UIImage?
5555
/// 最小化按钮图片
56-
public var min = CLImageHelper.imageWithName("CLSmallscreen")
57-
58-
public init(back: UIImage? = nil,
59-
more: UIImage? = nil,
60-
play: UIImage? = nil,
61-
pause: UIImage? = nil,
62-
slider: UIImage? = nil,
63-
max: UIImage? = nil,
64-
min: UIImage? = nil)
56+
public var min: UIImage?
57+
58+
public init(back: UIImage? = CLImageHelper.imageWithName("CLBack"),
59+
more: UIImage? = CLImageHelper.imageWithName("CLMore"),
60+
play: UIImage? = CLImageHelper.imageWithName("CLPlay"),
61+
pause: UIImage? = CLImageHelper.imageWithName("CLPause"),
62+
slider: UIImage? = CLImageHelper.imageWithName("CLSlider"),
63+
max: UIImage? = CLImageHelper.imageWithName("CLFullscreen"),
64+
min: UIImage? = CLImageHelper.imageWithName("CLSmallscreen"))
6565
{
6666
self.back = back
6767
self.more = more

CLPlayer/CLPlayerContentView/CLPlayerContentView.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ class CLPlayerContentView: UIView {
9494

9595
private lazy var backButton: UIButton = {
9696
let view = UIButton()
97-
view.setImage(CLImageHelper.imageWithName("CLBack"), for: .normal)
9897
view.addTarget(self, action: #selector(backButtonAction), for: .touchUpInside)
9998
return view
10099
}()
@@ -106,23 +105,18 @@ class CLPlayerContentView: UIView {
106105

107106
private lazy var moreButton: UIButton = {
108107
let view = UIButton()
109-
view.setImage(CLImageHelper.imageWithName("CLMore"), for: .normal)
110108
view.addTarget(self, action: #selector(moreButtonAction), for: .touchUpInside)
111109
return view
112110
}()
113111

114112
private lazy var playButton: UIButton = {
115113
let view = UIButton()
116-
view.setImage(CLImageHelper.imageWithName("CLPlay"), for: .normal)
117-
view.setImage(CLImageHelper.imageWithName("CLPause"), for: .selected)
118114
view.addTarget(self, action: #selector(playButtonAction(_:)), for: .touchUpInside)
119115
return view
120116
}()
121117

122118
private lazy var fullButton: UIButton = {
123119
let view = UIButton()
124-
view.setImage(CLImageHelper.imageWithName("CLFullscreen"), for: .normal)
125-
view.setImage(CLImageHelper.imageWithName("CLSmallscreen"), for: .selected)
126120
view.addTarget(self, action: #selector(fullButtonAction(_:)), for: .touchUpInside)
127121
return view
128122
}()

CLPlayer/CLPlayerContentView/CLSlider.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ class CLSlider: UISlider {
2929
// MARK: - JmoVxia---布局
3030

3131
private extension CLSlider {
32-
func initUI() {
33-
let thumbImage = CLImageHelper.imageWithName("CLSlider")
34-
setThumbImage(thumbImage, for: .normal)
35-
}
32+
func initUI() {}
3633
}
3734

3835
// MARK: - JmoVxia---override

0 commit comments

Comments
 (0)