From d03eda19602689ff25dbfc334d89e041ddf915a0 Mon Sep 17 00:00:00 2001 From: nixzhu Date: Mon, 11 Jan 2016 16:55:18 +0800 Subject: [PATCH] giveUpMentionUserAction for MessageToolbar to hide mentionView if it's not be use --- .../Conversation/ConversationViewController.swift | 4 ++++ Yep/Views/MessageToolbar/MessageToolbar.swift | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift index 4879b3bb..b07fd52f 100644 --- a/Yep/ViewControllers/Conversation/ConversationViewController.swift +++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift @@ -976,6 +976,10 @@ class ConversationViewController: BaseViewController { } } + messageToolbar.giveUpMentionUserAction = { [weak self] in + self?.mentionView.hide() + } + // 在这里才尝试恢复 messageToolbar 的状态，因为依赖 stateTransitionAction func tryRecoverMessageToolBar() { diff --git a/Yep/Views/MessageToolbar/MessageToolbar.swift b/Yep/Views/MessageToolbar/MessageToolbar.swift index 008e5b08..f4d7ccae 100644 --- a/Yep/Views/MessageToolbar/MessageToolbar.swift +++ b/Yep/Views/MessageToolbar/MessageToolbar.swift @@ -144,6 +144,7 @@ class MessageToolbar: UIToolbar { var notifyTypingAction: (() -> Void)? var tryMentionUserAction: ((usernamePrefix: String) -> Void)? + var giveUpMentionUserAction: (() -> Void)? var textSendAction: ((messageToolBar: MessageToolbar) -> Void)? @@ -494,8 +495,12 @@ extension MessageToolbar: UITextViewDelegate { let usernamePrefix = lastPart.substringFromIndex(lastPart.startIndex.advancedBy(1)) mentionUsernameRange = text.rangeOfString(lastPart) tryMentionUserAction?(usernamePrefix: usernamePrefix) + + return } } + + giveUpMentionUserAction?() } } }