Skip to content

Commit

Permalink
修复问题，可以正常使用了
Browse files Browse the repository at this point in the history
  • Loading branch information
qianyb committed Dec 28, 2018
1 parent 83e9203 commit 021f7e9
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 33 deletions.
14 changes: 6 additions & 8 deletions Project 29 - iMessageImagePicker/ImagePickerSheetController/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,20 @@
<rect key="frame" x="20" y="200" width="335" height="62"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="Enter your username" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="1n9-Mp-Vvb">
<rect key="frame" x="0.0" y="0.0" width="335" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="V8H-OC-aMf"/>
</constraints>
<rect key="frame" x="0.0" y="0.0" width="335" height="28"/>
<color key="textColor" red="0.99987119436264038" green="0.99998223781585693" blue="0.99984109401702881" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="18"/>
<textInputTraits key="textInputTraits"/>
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="43E-a5-TGe">
<rect key="frame" x="0.0" y="38" width="335" height="1"/>
<rect key="frame" x="0.0" y="36" width="335" height="1"/>
<color key="backgroundColor" red="0.99987119436264038" green="0.99998223781585693" blue="0.99984109401702881" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="jVW-iy-bxY"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="We respect your privacy. Your information is safe with us." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U6G-49-VTj">
<rect key="frame" x="12" y="47" width="311" height="15"/>
<rect key="frame" x="12" y="45" width="311" height="17"/>
<fontDescription key="fontDescription" name="AvenirNext-Medium" family="Avenir Next" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.30268554687499999" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
Expand All @@ -65,9 +62,8 @@
<constraint firstAttribute="height" constant="62" id="GbQ-7H-mVq"/>
<constraint firstItem="43E-a5-TGe" firstAttribute="leading" secondItem="79X-Iz-PPa" secondAttribute="leading" id="IWG-Me-1Hx"/>
<constraint firstItem="U6G-49-VTj" firstAttribute="top" secondItem="43E-a5-TGe" secondAttribute="bottom" constant="8" id="Ikr-JF-Zn6"/>
<constraint firstItem="1n9-Mp-Vvb" firstAttribute="leading" secondItem="79X-Iz-PPa" secondAttribute="leading" id="XuN-HM-3RE"/>
<constraint firstItem="1n9-Mp-Vvb" firstAttribute="leading" secondItem="43E-a5-TGe" secondAttribute="leading" id="MyF-ui-Gvk"/>
<constraint firstAttribute="bottom" secondItem="U6G-49-VTj" secondAttribute="bottom" id="ZFZ-Sz-gUx"/>
<constraint firstAttribute="trailing" secondItem="1n9-Mp-Vvb" secondAttribute="trailing" id="jex-1e-cRu"/>
<constraint firstAttribute="trailing" secondItem="43E-a5-TGe" secondAttribute="trailing" id="w3E-5L-VPi"/>
</constraints>
</view>
Expand Down Expand Up @@ -98,7 +94,9 @@
<constraint firstAttribute="trailing" secondItem="79X-Iz-PPa" secondAttribute="trailing" constant="20" id="CUc-6G-n8e"/>
<constraint firstItem="Eid-zq-ry3" firstAttribute="centerX" secondItem="1n9-Mp-Vvb" secondAttribute="centerX" id="Mku-kI-6dx"/>
<constraint firstItem="HSd-uX-27N" firstAttribute="top" secondItem="zK7-4Y-CHR" secondAttribute="bottom" id="Nev-Z0-kd7"/>
<constraint firstItem="Eid-zq-ry3" firstAttribute="centerX" secondItem="79X-Iz-PPa" secondAttribute="centerX" id="OKZ-N9-ROS"/>
<constraint firstItem="SEV-0x-qeq" firstAttribute="top" secondItem="oPw-P1-QLV" secondAttribute="bottom" constant="8" id="Rhm-Ky-XKS"/>
<constraint firstItem="lOG-dA-Hzr" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="SEV-0x-qeq" secondAttribute="trailing" constant="8" symbolic="YES" id="TnE-z1-9tj"/>
<constraint firstAttribute="trailingMargin" secondItem="lOG-dA-Hzr" secondAttribute="trailing" constant="2" id="Ttk-dR-5aQ"/>
<constraint firstItem="79X-Iz-PPa" firstAttribute="leading" secondItem="Pjp-Sg-GyJ" secondAttribute="leading" constant="20" id="ZoJ-W0-61k"/>
<constraint firstItem="79X-Iz-PPa" firstAttribute="centerX" secondItem="Pjp-Sg-GyJ" secondAttribute="centerX" id="be1-Jk-uRK"/>
Expand Down
26 changes: 13 additions & 13 deletions ...eImagePicker/ImagePickerSheetController/ImagePickerSheet/ImagePickerSheetController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class ImagePickerSheetController: UIViewController, UITableViewDataSource

private lazy var collectionView: ImagePickerCollectionView = {
let collectionView = ImagePickerCollectionView()
collectionView.backgroundColor = .clear
collectionView.backgroundColor = UIColor(red: 0.8, green: 0.8, blue: 0.8, alpha: 1)
collectionView.imagePreviewLayout.sectionInset = UIEdgeInsets(top: collectionViewInset, left: collectionViewInset, bottom: collectionViewInset, right: collectionViewInset)
collectionView.imagePreviewLayout.showsSupplementaryViews = false
collectionView.dataSource = self
Expand All @@ -47,8 +47,8 @@ public class ImagePickerSheetController: UIViewController, UITableViewDataSource

lazy var backgroundView: UIView = {
let view = UIView()
view.backgroundColor = UIColor(white: 0.0, alpha: 0.3961)
view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(ImagePickerSheetController.cancel)))
view.backgroundColor = UIColor(white: 0, alpha: 0.3961)
view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.cancel)))

return view
}()
Expand Down Expand Up @@ -95,16 +95,14 @@ public class ImagePickerSheetController: UIViewController, UITableViewDataSource
}

// MARK: - UITableViewDataSource

public func numberOfSectionsInTableView(tableView: UITableView) -> Int {
public func numberOfSections(in tableView: UITableView) -> Int {
return 2
}

public func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if section == 0 {
return 1
}

return actions.count
}

Expand All @@ -113,10 +111,8 @@ public class ImagePickerSheetController: UIViewController, UITableViewDataSource
if assets.count > 0 {
return enlargedPreviews ? tableViewEnlargedPreviewRowHeight : tableViewPreviewRowHeight
}

return 0
}

return tableViewRowHeight
}

Expand Down Expand Up @@ -360,7 +356,7 @@ public class ImagePickerSheetController: UIViewController, UITableViewDataSource
// MARK: - Buttons

private func reloadButtonTitles() {
tableView.reloadSections(IndexSet(integer: 1) as IndexSet, with: .none)
tableView.reloadSections(IndexSet(integer: 0) as IndexSet, with: .none)
}

@objc private func cancel() {
Expand All @@ -376,11 +372,15 @@ public class ImagePickerSheetController: UIViewController, UITableViewDataSource

public override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews()

backgroundView.frame = view.bounds

let tableViewHeight = Array(0..<tableView.numberOfRows(inSection: 1)).reduce(tableView(tableView, heightForRowAt: IndexPath(row: 0, section: 0))) { total, row in
total + tableView(tableView, heightForRowAt: IndexPath(row: row, section: 1))
let tableViewHeight = Array(0 ..< self.numberOfSections(in: tableView)).map { section in
Array(0 ..< self.tableView(tableView, numberOfRowsInSection: section)).reduce(0) {
(subTotal, row) in
subTotal + tableView(tableView, heightForRowAt: IndexPath(row: row, section: section))
}
}.reduce(0) {
(total, subTotal) in total + subTotal
}

tableView.frame = CGRect(x: view.bounds.minX, y: view.bounds.maxY-tableViewHeight, width: view.bounds.width, height: tableViewHeight)
Expand Down
21 changes: 9 additions & 12 deletions ...ect 29 - iMessageImagePicker/ImagePickerSheetController/SignupProfileViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,26 @@ class SignupProfileViewController: UIViewController

if authorization == .authorized {
let controller = ImagePickerSheetController()

controller.addAction(action: ImageAction(title: NSLocalizedString("Take Photo or Video", comment: "Action Title"), secondaryTitle: NSLocalizedString("Use this one", comment: "Action Title"), handler: { (_) -> () in

controller.addAction(action: ImageAction(title: NSLocalizedString("Take Photo or Video", comment: "Action Title"), secondaryTitle: NSLocalizedString("Use this one", comment: "Action Title"), handler: { _ in
self.presentCamera()

}, secondaryHandler: { (action, numberOfPhotos) -> () in
controller.getSelectedImagesWithCompletion(completion: { (images) -> Void in
self.profileImage = images[0]
self.userProfileImageView.image = self.profileImage
})
}, secondaryHandler: { (action, numberOfPhotos) in
controller.getSelectedImagesWithCompletion(completion: { images in
self.profileImage = images[0]
self.userProfileImageView.image = self.profileImage
})
}))

controller.addAction(action: ImageAction(title: NSLocalizedString("Cancel", comment: "Action Title"), style: .Cancel, handler: nil, secondaryHandler: nil))

present(controller, animated: true, completion: nil)
self.present(controller, animated: true, completion: nil)
}


}

func presentCamera()
{

print("拍照")
}


Expand Down

0 comments on commit 021f7e9

Please sign in to comment.