diff --git a/Podfile b/Podfile index 8441898..6ce4cda 100644 --- a/Podfile +++ b/Podfile @@ -10,8 +10,13 @@ post_install do |installer| config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" end end + + installer.pods_project.build_configurations.each do |config| + config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64" + end end + target 'ShortPlay' do # Comment the next line if you don't want to use dynamic frameworks use_frameworks! diff --git a/Podfile.lock b/Podfile.lock index 38fb14f..3cac271 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -61,6 +61,6 @@ SPEC CHECKSUMS: YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7 ZFPlayer: 5cf39e8d9f0c2394a014b0db4767b5b5a6bffe13 -PODFILE CHECKSUM: 56661899b7b42659f95553caa85ba6ea5667ded3 +PODFILE CHECKSUM: 13500f038833f93358c53b1941ce4a7f311776dd COCOAPODS: 1.16.2 diff --git a/ShortPlay.xcodeproj/project.pbxproj b/ShortPlay.xcodeproj/project.pbxproj index c05cd2a..97b1e68 100644 --- a/ShortPlay.xcodeproj/project.pbxproj +++ b/ShortPlay.xcodeproj/project.pbxproj @@ -433,6 +433,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 1AC17585C566B70F526D3938 /* Pods-ShortPlay.debug.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; @@ -461,6 +462,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "ShortPlay/Source/ShortPlay-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; + VALID_ARCHS = "arm64 arm64e x86_64"; }; name = Debug; }; @@ -468,6 +470,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = 9DF7FB1047F612A65429345F /* Pods-ShortPlay.release.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; @@ -496,6 +499,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "ShortPlay/Source/ShortPlay-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; + VALID_ARCHS = "arm64 arm64e x86_64"; }; name = Release; }; diff --git a/ShortPlay/Class/MyList/Controller/SPCollectListViewController.swift b/ShortPlay/Class/MyList/Controller/SPCollectListViewController.swift index 9f7e52b..930778d 100644 --- a/ShortPlay/Class/MyList/Controller/SPCollectListViewController.swift +++ b/ShortPlay/Class/MyList/Controller/SPCollectListViewController.swift @@ -35,7 +35,7 @@ class SPCollectListViewController: SPViewController { collectionView.sp_addRefreshHeader(insetTop: collectionView.contentInset.top) { [weak self] in self?.handleHeaderRefresh(nil) } - collectionView.sp_addRefreshFooter { [weak self] in + collectionView.sp_addRefreshBackFooter { [weak self] in self?.handleFooterRefresh(nil) } SPCollectListCell.registerCell(collectionView: collectionView) @@ -54,14 +54,19 @@ class SPCollectListViewController: SPViewController { override func setBgImageView() { } - override func handleHeaderRefresh() { + override func handleHeaderRefresh(_ completer: (() -> Void)?) { requestDataList(page: 1) { [weak self] in self?.collectionView.sp_endHeaderRefreshing() } } - - + override func handleFooterRefresh(_ completer: (() -> Void)?) { + guard let page = self.page else { return } + + requestDataList(page: page + 1) { [weak self] in + self?.collectionView.sp_endFooterRefreshing() + } + } } extension SPCollectListViewController { @@ -90,6 +95,10 @@ extension SPCollectListViewController: UICollectionViewDelegate, UICollectionVie return self.dataArr.count } + func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { + + } + } extension SPCollectListViewController {