Skip to content

Commit e456ff7

Browse files
author
JmoVxia
committed
fix
1 parent 0939adb commit e456ff7

File tree

8 files changed

+49
-235
lines changed

8 files changed

+49
-235
lines changed

‎CLAutolayoutController/CLAutolayoutController.swift‎

Lines changed: 0 additions & 159 deletions
This file was deleted.

‎CLCollectionViewController/CLCollectionViewController.swift‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ class CLCollectionViewController: CLController {
2727
deinit {}
2828

2929
private lazy var collectionView: UICollectionView = {
30+
let width = (view.bounds.width - 30) * 0.5
3031
let layout = UICollectionViewFlowLayout()
3132
layout.minimumLineSpacing = 10
3233
layout.minimumInteritemSpacing = 10
33-
layout.itemSize = CGSize(width: view.bounds.width - 20, height: (view.bounds.width - 20) * 9.0 / 16.0)
34+
layout.itemSize = CGSize(width: width, height: width * 9.0 / 16.0)
3435
let view = UICollectionView(frame: .zero, collectionViewLayout: layout)
3536
view.contentInset = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
3637
view.backgroundColor = .clear
@@ -126,7 +127,16 @@ private extension CLCollectionViewController {
126127

127128
// MARK: - JmoVxia---override
128129

129-
extension CLCollectionViewController {}
130+
extension CLCollectionViewController {
131+
override var shouldAutorotate: Bool {
132+
return false
133+
}
134+
135+
// 支持哪些屏幕方向
136+
override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
137+
return .portrait
138+
}
139+
}
130140

131141
// MARK: - JmoVxia---objc
132142

@@ -148,10 +158,7 @@ private extension CLCollectionViewController {
148158
})
149159
player?.url = URL(string: array[indexPath.row])
150160
cell.contentView.addSubview(player!)
151-
player?.snp.remakeConstraints { make in
152-
make.top.left.equalToSuperview()
153-
make.size.equalTo(CGSize(width: cell.contentView.bounds.width, height: cell.contentView.bounds.height - 10))
154-
}
161+
player?.frame = cell.contentView.bounds
155162
player?.play()
156163
}
157164
}
@@ -181,10 +188,7 @@ extension CLCollectionViewController: UICollectionViewDelegate {
181188
guard array[indexPath.row] == player.url?.absoluteString else { return }
182189

183190
cell.contentView.addSubview(player)
184-
player.snp.remakeConstraints { make in
185-
make.top.left.equalToSuperview()
186-
make.size.equalTo(CGSize(width: cell.contentView.bounds.width, height: cell.contentView.bounds.height - 10))
187-
}
191+
player.frame = cell.contentView.bounds
188192
player.play()
189193
}
190194

‎CLHomeController/Controller/CLHomeController.swift‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -98,19 +98,10 @@ private extension CLHomeController {
9898
func initData() {
9999
do {
100100
let item = CLListItem()
101-
item.title = "Autolayout创建"
101+
item.title = "普通View"
102102
item.didSelectCellCallback = { [weak self] _ in
103103
guard let self = self else { return }
104-
self.pushToAutolayout()
105-
}
106-
tableViewHepler.dataSource.append(item)
107-
}
108-
do {
109-
let item = CLListItem()
110-
item.title = "Frame创建"
111-
item.didSelectCellCallback = { [weak self] _ in
112-
guard let self = self else { return }
113-
self.pushToFrame()
104+
self.pushToView()
114105
}
115106
tableViewHepler.dataSource.append(item)
116107
}
@@ -147,12 +138,8 @@ extension CLHomeController {}
147138
// MARK: - JmoVxia---私有方法
148139

149140
private extension CLHomeController {
150-
func pushToAutolayout() {
151-
navigationController?.pushViewController(CLAutolayoutController(), animated: true)
152-
}
153-
154-
func pushToFrame() {
155-
navigationController?.pushViewController(CLFrameController(), animated: true)
141+
func pushToView() {
142+
navigationController?.pushViewController(CLViewController(), animated: true)
156143
}
157144

158145
func pushToTableView() {

‎CLPlayer.xcodeproj/project.pbxproj‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
5BE1F31B2727DCDB0090F6C8 /* CLMoreController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE1F31A2727DCDB0090F6C8 /* CLMoreController.swift */; };
3737
5BE1F3202727DDC00090F6C8 /* CLListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE1F31F2727DDC00090F6C8 /* CLListCell.swift */; };
3838
5BE1F3252727DE4C0090F6C8 /* CLListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE1F3242727DE4C0090F6C8 /* CLListItem.swift */; };
39-
5BE1F32A2727E0F80090F6C8 /* CLAutolayoutController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE1F3292727E0F80090F6C8 /* CLAutolayoutController.swift */; };
4039
5BE1F32D2727E1430090F6C8 /* CLTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE1F32C2727E1430090F6C8 /* CLTableViewController.swift */; };
4140
5BE1F3322727E21E0090F6C8 /* CLBackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE1F3312727E21E0090F6C8 /* CLBackView.swift */; };
4241
5BE1F3342727E3800090F6C8 /* UIImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BE1F3332727E3800090F6C8 /* UIImage+Extension.swift */; };
@@ -45,7 +44,7 @@
4544
5BF306642728DFB40046075A /* CLFullScreenController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF306632728DFB40046075A /* CLFullScreenController.swift */; };
4645
5BFADCAC2767415200A596A6 /* CLPlayerContentPanelHeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BFADCAB2767415200A596A6 /* CLPlayerContentPanelHeadView.swift */; };
4746
5BFADCAE276742F500A596A6 /* CLPlayerContentPanelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BFADCAD276742F500A596A6 /* CLPlayerContentPanelCell.swift */; };
48-
5BFADCB6276888B400A596A6 /* CLFrameController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BFADCB5276888B400A596A6 /* CLFrameController.swift */; };
47+
5BFADCB6276888B400A596A6 /* CLViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BFADCB5276888B400A596A6 /* CLViewController.swift */; };
4948
5BFADCBA276893B600A596A6 /* CLGCDTimer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BFADCB9276893B600A596A6 /* CLGCDTimer.swift */; };
5049
5BFADCC027689C5500A596A6 /* CLTableViewItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BFADCBF27689C5500A596A6 /* CLTableViewItem.swift */; };
5150
5BFADCC227689C6300A596A6 /* CLTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BFADCC127689C6300A596A6 /* CLTableViewCell.swift */; };
@@ -84,7 +83,6 @@
8483
5BE1F31A2727DCDB0090F6C8 /* CLMoreController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLMoreController.swift; sourceTree = "<group>"; };
8584
5BE1F31F2727DDC00090F6C8 /* CLListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLListCell.swift; sourceTree = "<group>"; };
8685
5BE1F3242727DE4C0090F6C8 /* CLListItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLListItem.swift; sourceTree = "<group>"; };
87-
5BE1F3292727E0F80090F6C8 /* CLAutolayoutController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLAutolayoutController.swift; sourceTree = "<group>"; };
8886
5BE1F32C2727E1430090F6C8 /* CLTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLTableViewController.swift; sourceTree = "<group>"; };
8987
5BE1F3312727E21E0090F6C8 /* CLBackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLBackView.swift; sourceTree = "<group>"; };
9088
5BE1F3332727E3800090F6C8 /* UIImage+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIImage+Extension.swift"; sourceTree = "<group>"; };
@@ -93,7 +91,7 @@
9391
5BF306632728DFB40046075A /* CLFullScreenController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLFullScreenController.swift; sourceTree = "<group>"; };
9492
5BFADCAB2767415200A596A6 /* CLPlayerContentPanelHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLPlayerContentPanelHeadView.swift; sourceTree = "<group>"; };
9593
5BFADCAD276742F500A596A6 /* CLPlayerContentPanelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLPlayerContentPanelCell.swift; sourceTree = "<group>"; };
96-
5BFADCB5276888B400A596A6 /* CLFrameController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLFrameController.swift; sourceTree = "<group>"; };
94+
5BFADCB5276888B400A596A6 /* CLViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLViewController.swift; sourceTree = "<group>"; };
9795
5BFADCB9276893B600A596A6 /* CLGCDTimer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLGCDTimer.swift; sourceTree = "<group>"; };
9896
5BFADCBF27689C5500A596A6 /* CLTableViewItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLTableViewItem.swift; sourceTree = "<group>"; };
9997
5BFADCC127689C6300A596A6 /* CLTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CLTableViewCell.swift; sourceTree = "<group>"; };
@@ -166,8 +164,7 @@
166164
5B37DEE82727DBD9002A377A /* CLTableView */,
167165
5BE1F31C2727DD960090F6C8 /* CLHomeController */,
168166
5BE1F31D2727DDA10090F6C8 /* CLMoreController */,
169-
5BE1F3282727E0C60090F6C8 /* CLAutolayoutController */,
170-
5BFADCB42768888500A596A6 /* CLFrameController */,
167+
5BFADCB42768888500A596A6 /* CLViewController */,
171168
5BE1F32B2727E11F0090F6C8 /* CLTableViewController */,
172169
5BC41036276B188900DFE028 /* CLCollectionViewController */,
173170
5BE1F3372727E55E0090F6C8 /* Resources */,
@@ -285,14 +282,6 @@
285282
path = Cell;
286283
sourceTree = "<group>";
287284
};
288-
5BE1F3282727E0C60090F6C8 /* CLAutolayoutController */ = {
289-
isa = PBXGroup;
290-
children = (
291-
5BE1F3292727E0F80090F6C8 /* CLAutolayoutController.swift */,
292-
);
293-
path = CLAutolayoutController;
294-
sourceTree = "<group>";
295-
};
296285
5BE1F32B2727E11F0090F6C8 /* CLTableViewController */ = {
297286
isa = PBXGroup;
298287
children = (
@@ -354,12 +343,12 @@
354343
path = Resources;
355344
sourceTree = "<group>";
356345
};
357-
5BFADCB42768888500A596A6 /* CLFrameController */ = {
346+
5BFADCB42768888500A596A6 /* CLViewController */ = {
358347
isa = PBXGroup;
359348
children = (
360-
5BFADCB5276888B400A596A6 /* CLFrameController.swift */,
349+
5BFADCB5276888B400A596A6 /* CLViewController.swift */,
361350
);
362-
path = CLFrameController;
351+
path = CLViewController;
363352
sourceTree = "<group>";
364353
};
365354
5BFADCB72768936C00A596A6 /* CLPlayerContentView */ = {
@@ -567,7 +556,6 @@
567556
5BA39B182727D147005059F5 /* AppDelegate.swift in Sources */,
568557
5B37DEF02727DBD9002A377A /* CLCellProtocol.swift in Sources */,
569558
5B37DEEF2727DBD9002A377A /* CLCellItemProtocol.swift in Sources */,
570-
5BE1F32A2727E0F80090F6C8 /* CLAutolayoutController.swift in Sources */,
571559
5B33B4DE2769EAA20086B402 /* CLPlayerConfigure.swift in Sources */,
572560
5BE1F3322727E21E0090F6C8 /* CLBackView.swift in Sources */,
573561
5B72C197272A868E004B9AEA /* CLPlayerContentViewDelegate.swift in Sources */,
@@ -589,7 +577,7 @@
589577
5B37DEE52727DB04002A377A /* CLController.swift in Sources */,
590578
5BA11A70276AD7290093B418 /* NSMutableAttributedString+Extension.swift in Sources */,
591579
5BE1F3202727DDC00090F6C8 /* CLListCell.swift in Sources */,
592-
5BFADCB6276888B400A596A6 /* CLFrameController.swift in Sources */,
580+
5BFADCB6276888B400A596A6 /* CLViewController.swift in Sources */,
593581
);
594582
runOnlyForDeploymentPostprocessing = 0;
595583
};

0 commit comments

Comments
 (0)