Skip to content

Commit 4ef81ff

Browse files
easyuieasyui
committed
fix：pod lib lint
1 parent f2da25e commit 4ef81ff

File tree

6 files changed

+47
-119
lines changed

6 files changed

+47
-119
lines changed

‎EZPlayer.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Pod::Spec.new do |s|
9393
#
9494

9595
s.source_files = "EZPlayer/*"
96-
s.exclude_files = "EZPlayerExample/*", "EZPlayerExample_RN/*"
96+
s.exclude_files = "EZPlayerExample/*", "EZPlayerExample_RN/*", "EZPlayer/*.plist"
9797

9898
# s.public_header_files = "Classes/**/*.h"
9999

‎EZPlayer.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
99C221DC1DDCB4EB00167DBE /* EZPlayerContentItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99C221DB1DDCB4EB00167DBE /* EZPlayerContentItem.swift */; };
5959
99CF4D691E06B43200798ACE /* EZPlayerAudibleLegibleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99CF4D671E06B43200798ACE /* EZPlayerAudibleLegibleViewController.swift */; };
6060
99CF4D6A1E06B43200798ACE /* EZPlayerAudibleLegibleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 99CF4D681E06B43200798ACE /* EZPlayerAudibleLegibleViewController.xib */; };
61-
99EB8CB01E0FFEEC00176BF2 /* EZPlayerWindowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99EB8CAF1E0FFEEC00176BF2 /* EZPlayerWindowView.swift */; };
6261
99EB8CB21E0FFF0300176BF2 /* EZPlayerWindowView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 99EB8CB11E0FFF0300176BF2 /* EZPlayerWindowView.xib */; };
6362
A6C56C692544114100BD9654 /* EZPlayerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6C56C682544114000BD9654 /* EZPlayerDelegate.swift */; };
63+
A6D956302547B83B002D8A2D /* EZPlayerWindowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A6D9562F2547B83B002D8A2D /* EZPlayerWindowView.swift */; };
6464
/* End PBXBuildFile section */
6565

6666
/* Begin PBXFileReference section */
@@ -92,9 +92,9 @@
9292
99C221DB1DDCB4EB00167DBE /* EZPlayerContentItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EZPlayerContentItem.swift; sourceTree = "<group>"; };
9393
99CF4D671E06B43200798ACE /* EZPlayerAudibleLegibleViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EZPlayerAudibleLegibleViewController.swift; sourceTree = "<group>"; };
9494
99CF4D681E06B43200798ACE /* EZPlayerAudibleLegibleViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EZPlayerAudibleLegibleViewController.xib; sourceTree = "<group>"; };
95-
99EB8CAF1E0FFEEC00176BF2 /* EZPlayerWindowView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EZPlayerWindowView.swift; path = ../../../Downloads/EZPlayerWindowView.swift; sourceTree = "<group>"; };
9695
99EB8CB11E0FFF0300176BF2 /* EZPlayerWindowView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EZPlayerWindowView.xib; sourceTree = "<group>"; };
9796
A6C56C682544114000BD9654 /* EZPlayerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EZPlayerDelegate.swift; sourceTree = "<group>"; };
97+
A6D9562F2547B83B002D8A2D /* EZPlayerWindowView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EZPlayerWindowView.swift; sourceTree = "<group>"; };
9898
/* End PBXFileReference section */
9999

100100
/* Begin PBXFrameworksBuildPhase section */
@@ -195,7 +195,7 @@
195195
children = (
196196
995E79271DD9A2E9006CE7E9 /* EZPlayerControlView.swift */,
197197
995E79291DD9A322006CE7E9 /* EZPlayerControlView.xib */,
198-
99EB8CAF1E0FFEEC00176BF2 /* EZPlayerWindowView.swift */,
198+
A6D9562F2547B83B002D8A2D /* EZPlayerWindowView.swift */,
199199
99EB8CB11E0FFF0300176BF2 /* EZPlayerWindowView.xib */,
200200
);
201201
name = Skin;
@@ -327,6 +327,7 @@
327327
buildActionMask = 2147483647;
328328
files = (
329329
9933B2051DFEFA920066A09A /* EZPlayerThumbnail.swift in Sources */,
330+
A6D956302547B83B002D8A2D /* EZPlayerWindowView.swift in Sources */,
330331
995D47AC1DFFB0B400BEB41B /* EZPlayerWindowContainerRootViewController.swift in Sources */,
331332
99818A681DE948D1000DAC1C /* EZPlayerNotification.swift in Sources */,
332333
99C221DC1DDCB4EB00167DBE /* EZPlayerContentItem.swift in Sources */,
@@ -336,7 +337,6 @@
336337
99C221D81DDCAC5400167DBE /* EZPlayerTransport.swift in Sources */,
337338
995E79281DD9A2E9006CE7E9 /* EZPlayerControlView.swift in Sources */,
338339
99B999761E2763BA00DBC4AA /* AVPlayer+EZPlayer.swift in Sources */,
339-
99EB8CB01E0FFEEC00176BF2 /* EZPlayerWindowView.swift in Sources */,
340340
99998A261DE3450700296EDB /* Timer+EZPlayer.swift in Sources */,
341341
99C221DA1DDCAEEA00167DBE /* EZPlayerTransportExtension.swift in Sources */,
342342
A6C56C692544114100BD9654 /* EZPlayerDelegate.swift in Sources */,

‎EZPlayer.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
<key>BuildSystemType</key>
6-
<string>Original</string>
75
<key>PreviewsEnabled</key>
86
<false/>
97
</dict>

‎EZPlayer/EZPlayerFloatView.swift

-69
This file was deleted.

‎EZPlayer/EZPlayerWindowView.swift

+24-18
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,30 @@ import UIKit
1010

1111
open class EZPlayerWindowView: UIView, EZPlayerCustomAction {
1212
public var autohidedControlViews = [UIView]()
13-
14-
15-
/*
16-
// Only override draw() if you perform custom drawing.
17-
// An empty implementation adversely affects performance during animation.
18-
override func draw(_ rect: CGRect) {
19-
// Drawing code
20-
}
21-
*/
22-
23-
weak public var player: EZPlayer?
13+
14+
@IBOutlet weak var backButton: UIButton!
15+
16+
override open func awakeFromNib() {
17+
super.awakeFromNib()
18+
19+
}
20+
21+
weak public var player: EZPlayer?{
22+
didSet {
23+
if let _ = player?.scrollView{
24+
self.backButton.isHidden = true
25+
}else{
26+
self.backButton.isHidden = false
27+
}
28+
}
29+
}
2430
public func playPauseButtonPressed(_ sender: Any){
2531
}
2632
public func fullEmbeddedScreenButtonPressed(_ sender: Any){
2733
}
2834
public func audioSubtitleCCButtonPressed(_ sender: Any){
2935
}
30-
36+
3137
@IBAction public func backButtonPressed(_ sender: Any){
3238
guard let player = self.player else {
3339
return
@@ -42,16 +48,16 @@ open class EZPlayerWindowView: UIView, EZPlayerCustomAction {
4248
}
4349
self.player?.backButtonBlock?(.float)
4450
}
45-
51+
4652
@IBAction public func closeButtonPressed(_ sender: Any){
4753
self.player?.stop()
4854
}
49-
55+
5056
}
5157

5258

5359
extension EZPlayerWindowView: EZPlayerGestureRecognizer {
54-
60+
5561
public func player(_ player: EZPlayer, singleTapGestureTapped singleTap: UITapGestureRecognizer)
5662
{
5763
if player.isPlaying {
@@ -60,10 +66,10 @@ extension EZPlayerWindowView: EZPlayerGestureRecognizer {
6066
player.play()
6167
}
6268
}
63-
69+
6470
public func player(_ player: EZPlayer, doubleTapGestureTapped doubleTap: UITapGestureRecognizer) {
6571
player.toFull()
6672
}
67-
68-
73+
74+
6975
}

‎EZPlayerExample/EZPlayerExample.xcodeproj/project.pbxproj

+18-25
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
99145C571E16685400891B06 /* VideosTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99145C561E16685400891B06 /* VideosTableViewController.swift */; };
1515
9914922B1DDBDA5F005FF2BD /* MediaManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9914922A1DDBDA5F005FF2BD /* MediaManager.swift */; };
1616
9914922D1DDBDF79005FF2BD /* MediaItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9914922C1DDBDF79005FF2BD /* MediaItem.swift */; };
17-
9914922E1DDBF442005FF2BD /* EZPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 995E794E1DD9A404006CE7E9 /* EZPlayer.framework */; };
18-
991595E21DE5D97B00D3CA1F /* EZPlayer.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 995E794E1DD9A404006CE7E9 /* EZPlayer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1917
99453E071DE41F5100BBF2FB /* hubblecast.m4v in Resources */ = {isa = PBXBuildFile; fileRef = 99453E061DE41F5100BBF2FB /* hubblecast.m4v */; };
2018
99504F811DE6C3BF00E1058D /* testVideo-0.ts in Resources */ = {isa = PBXBuildFile; fileRef = 99504F7E1DE6C3BF00E1058D /* testVideo-0.ts */; };
2119
99504F821DE6C3BF00E1058D /* testVideo-1.ts in Resources */ = {isa = PBXBuildFile; fileRef = 99504F7F1DE6C3BF00E1058D /* testVideo-1.ts */; };
@@ -27,24 +25,19 @@
2725
99C1A2C71DDB46510096A543 /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99C1A2C61DDB46510096A543 /* TabBarController.swift */; };
2826
99C1A2C91DDBC8EF0096A543 /* NavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99C1A2C81DDBC8EF0096A543 /* NavigationController.swift */; };
2927
99C1A2CD1DDBC9870096A543 /* ParamsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99C1A2CC1DDBC9870096A543 /* ParamsViewController.swift */; };
28+
A621363B2547B4240083F70C /* EZPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 995E794E1DD9A404006CE7E9 /* EZPlayer.framework */; };
29+
A621363C2547B4240083F70C /* EZPlayer.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 995E794E1DD9A404006CE7E9 /* EZPlayer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3030
/* End PBXBuildFile section */
3131

3232
/* Begin PBXContainerItemProxy section */
33-
991595E31DE5D97B00D3CA1F /* PBXContainerItemProxy */ = {
34-
isa = PBXContainerItemProxy;
35-
containerPortal = 995E79491DD9A403006CE7E9 /* EZPlayer.xcodeproj */;
36-
proxyType = 1;
37-
remoteGlobalIDString = 995E79161DD99D5A006CE7E9;
38-
remoteInfo = EZPlayer;
39-
};
4033
995E794D1DD9A404006CE7E9 /* PBXContainerItemProxy */ = {
4134
isa = PBXContainerItemProxy;
4235
containerPortal = 995E79491DD9A403006CE7E9 /* EZPlayer.xcodeproj */;
4336
proxyType = 2;
4437
remoteGlobalIDString = 995E79171DD99D5A006CE7E9;
4538
remoteInfo = EZPlayer;
4639
};
47-
995E794F1DD9A41A006CE7E9 /* PBXContainerItemProxy */ = {
40+
A62136382547B41C0083F70C /* PBXContainerItemProxy */ = {
4841
isa = PBXContainerItemProxy;
4942
containerPortal = 995E79491DD9A403006CE7E9 /* EZPlayer.xcodeproj */;
5043
proxyType = 1;
@@ -54,13 +47,13 @@
5447
/* End PBXContainerItemProxy section */
5548

5649
/* Begin PBXCopyFilesBuildPhase section */
57-
991595E51DE5D97B00D3CA1F /* Embed Frameworks */ = {
50+
A621363D2547B4240083F70C /* Embed Frameworks */ = {
5851
isa = PBXCopyFilesBuildPhase;
5952
buildActionMask = 2147483647;
6053
dstPath = "";
6154
dstSubfolderSpec = 10;
6255
files = (
63-
991595E21DE5D97B00D3CA1F /* EZPlayer.framework in Embed Frameworks */,
56+
A621363C2547B4240083F70C /* EZPlayer.framework in Embed Frameworks */,
6457
);
6558
name = "Embed Frameworks";
6659
runOnlyForDeploymentPostprocessing = 0;
@@ -96,7 +89,7 @@
9689
isa = PBXFrameworksBuildPhase;
9790
buildActionMask = 2147483647;
9891
files = (
99-
9914922E1DDBF442005FF2BD /* EZPlayer.framework in Frameworks */,
92+
A621363B2547B4240083F70C /* EZPlayer.framework in Frameworks */,
10093
);
10194
runOnlyForDeploymentPostprocessing = 0;
10295
};
@@ -130,6 +123,7 @@
130123
995E79491DD9A403006CE7E9 /* EZPlayer.xcodeproj */,
131124
995E79361DD9A3CF006CE7E9 /* EZPlayerExample */,
132125
995E79351DD9A3CF006CE7E9 /* Products */,
126+
A621363A2547B4240083F70C /* Frameworks */,
133127
);
134128
sourceTree = "<group>";
135129
};
@@ -170,6 +164,13 @@
170164
name = Products;
171165
sourceTree = "<group>";
172166
};
167+
A621363A2547B4240083F70C /* Frameworks */ = {
168+
isa = PBXGroup;
169+
children = (
170+
);
171+
name = Frameworks;
172+
sourceTree = "<group>";
173+
};
173174
/* End PBXGroup section */
174175

175176
/* Begin PBXNativeTarget section */
@@ -180,13 +181,12 @@
180181
995E79301DD9A3CF006CE7E9 /* Sources */,
181182
995E79311DD9A3CF006CE7E9 /* Frameworks */,
182183
995E79321DD9A3CF006CE7E9 /* Resources */,
183-
991595E51DE5D97B00D3CA1F /* Embed Frameworks */,
184+
A621363D2547B4240083F70C /* Embed Frameworks */,
184185
);
185186
buildRules = (
186187
);
187188
dependencies = (
188-
995E79501DD9A41A006CE7E9 /* PBXTargetDependency */,
189-
991595E41DE5D97B00D3CA1F /* PBXTargetDependency */,
189+
A62136392547B41C0083F70C /* PBXTargetDependency */,
190190
);
191191
name = EZPlayerExample;
192192
productName = EZPlayerExample;
@@ -289,15 +289,10 @@
289289
/* End PBXSourcesBuildPhase section */
290290

291291
/* Begin PBXTargetDependency section */
292-
991595E41DE5D97B00D3CA1F /* PBXTargetDependency */ = {
293-
isa = PBXTargetDependency;
294-
name = EZPlayer;
295-
targetProxy = 991595E31DE5D97B00D3CA1F /* PBXContainerItemProxy */;
296-
};
297-
995E79501DD9A41A006CE7E9 /* PBXTargetDependency */ = {
292+
A62136392547B41C0083F70C /* PBXTargetDependency */ = {
298293
isa = PBXTargetDependency;
299294
name = EZPlayer;
300-
targetProxy = 995E794F1DD9A41A006CE7E9 /* PBXContainerItemProxy */;
295+
targetProxy = A62136382547B41C0083F70C /* PBXContainerItemProxy */;
301296
};
302297
/* End PBXTargetDependency section */
303298

@@ -433,7 +428,6 @@
433428
995E79471DD9A3CF006CE7E9 /* Debug */ = {
434429
isa = XCBuildConfiguration;
435430
buildSettings = {
436-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
437431
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
438432
CODE_SIGN_IDENTITY = "Apple Development";
439433
CODE_SIGN_STYLE = Automatic;
@@ -454,7 +448,6 @@
454448
995E79481DD9A3CF006CE7E9 /* Release */ = {
455449
isa = XCBuildConfiguration;
456450
buildSettings = {
457-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
458451
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
459452
CODE_SIGN_IDENTITY = "iPhone Developer: yangjun zhu (8NM4W5ZF88)";
460453
DEVELOPMENT_TEAM = "";

0 commit comments

Comments
 (0)