add cancel delegate

teambition · Aug 11, 2016 · 04f1cc8 · 04f1cc8
1 parent 144a383
commit 04f1cc8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/...enu.xcworkspace/xcuserdata/zhangxiaolian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...enu.xcworkspace/xcuserdata/zhangxiaolian.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -20,11 +20,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DropdownMenu/DropUpMenu.swift"
-            timestampString = "492575779.702114"
+            timestampString = "492599077.671665"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "29"
-            endingLineNumber = "29"
+            startingLineNumber = "30"
+            endingLineNumber = "30"
             landmarkName = "dropUpMenu(_:didSelectRowAtIndexPath:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -36,11 +36,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DropdownMenu/DropUpMenu.swift"
-            timestampString = "492577289.049253"
+            timestampString = "492599207.097013"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "241"
-            endingLineNumber = "241"
+            startingLineNumber = "247"
+            endingLineNumber = "247"
             landmarkName = "tableView(_:didSelectRowAtIndexPath:)"
             landmarkType = "5">
          </BreakpointContent>
@@ -52,11 +52,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "DropdownMenu/DropUpMenu.swift"
-            timestampString = "492576784.251824"
+            timestampString = "492599077.671665"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "168"
-            endingLineNumber = "168"
+            startingLineNumber = "172"
+            endingLineNumber = "172"
             landmarkName = "hideMenu()"
             landmarkType = "5">
             <Locations>

diff --git a/DropdownMenu/DropUpMenu.swift b/DropdownMenu/DropUpMenu.swift
@@ -19,6 +19,7 @@ import UIKit
 public protocol DropUpMenuDelegate: class {
     func dropUpMenu(dropUpMenu: DropUpMenu, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell?
     func dropUpMenu(dropUpMenu: DropUpMenu, didSelectRowAtIndexPath indexPath: NSIndexPath)
+    func dropUpMenuCancel(dropUpMenu: DropUpMenu)
 }
 
 public extension DropUpMenuDelegate {
@@ -28,6 +29,9 @@ public extension DropUpMenuDelegate {
 
     func dropUpMenu(dropUpMenu: DropUpMenu, didSelectRowAtIndexPath indexPath: NSIndexPath) {
     }
+
+    func dropUpMenuCancel(dropUpMenu: DropUpMenu) {
+    }
 }
 
 private let screenRect = UIScreen.mainScreen().bounds
@@ -169,6 +173,8 @@ public class DropUpMenu: UIView {
             self.backgroundColor = self.backgroudBeginColor
             self.tableView.frame.origin.y = screenRect.height - self.bottomOffsetY
         }) { (finished) in
+            self.delegate?.dropUpMenuCancel(self)
+
             self.barCoverView.removeFromSuperview()
             self.removeFromSuperview()
             self.isShow = false

diff --git a/DropdownMenu/DropdownMenu.swift b/DropdownMenu/DropdownMenu.swift
@@ -11,6 +11,7 @@ import UIKit
 public protocol DropdownMenuDelegate: class {
     func dropdownMenu(dropdownMenu: DropdownMenu, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell?
     func dropdownMenu(dropdownMenu: DropdownMenu, didSelectRowAtIndexPath indexPath: NSIndexPath)
+    func dropdownMenuCancel(dropdownMenu: DropdownMenu)
 }
 
 public extension DropdownMenuDelegate {
@@ -20,6 +21,9 @@ public extension DropdownMenuDelegate {
 
     func dropdownMenu(dropdownMenu: DropdownMenu, didSelectRowAtIndexPath indexPath: NSIndexPath) {
     }
+
+    func dropdownMenuCancel(dropdownMenu: DropdownMenu) {
+    }
 }
 
 public class DropdownMenu: UIView {
@@ -161,6 +165,7 @@ public class DropdownMenu: UIView {
             self.backgroundColor = self.backgroudBeginColor
             self.tableView.frame.origin.y = -self.tableViewHeight
         }) { (finished) in
+            self.delegate?.dropdownMenuCancel(self)
             self.barCoverView.removeFromSuperview()
             self.removeFromSuperview()
             self.isShow = false

diff --git a/DropdownMenuDemo/DropdownMenuDemo/ViewController.swift b/DropdownMenuDemo/DropdownMenuDemo/ViewController.swift
@@ -73,4 +73,8 @@ extension ViewController: DropUpMenuDelegate {
             print("Display success")
         }
     }
+
+    func dropUpMenuCancel(dropUpMenu: DropUpMenu) {
+        print("select cancel")
+    }
 }