diff --git a/HDWindowLoggerSwift/HDWindowLoggerSwift/HDWindowLoggerSwift.swift b/HDWindowLoggerSwift/HDWindowLoggerSwift/HDWindowLoggerSwift.swift
index 2dd5d14..d1484f2 100644
--- a/HDWindowLoggerSwift/HDWindowLoggerSwift/HDWindowLoggerSwift.swift
+++ b/HDWindowLoggerSwift/HDWindowLoggerSwift/HDWindowLoggerSwift.swift
@@ -82,7 +82,13 @@ public class HDWindowLoggerItem {
 public class HDWindowLoggerSwift: UIWindow, UITableViewDataSource, UITableViewDelegate, UISearchBarDelegate, UITextFieldDelegate {
     public static var mCompleteLogOut = true  //是否完整输出日志文件名等调试内容
     public static var mDebugAreaLogOut = true  //是否在xcode底部的调试栏同步输出内容
-    public static var mPrivacyPassword = ""    //解密隐私数据的密码，默认为空不加密
+    public static var mPrivacyPassword = "" {
+        willSet {
+            if newValue.count != kCCKeySizeAES256 {
+                HDErrorLog(NSLocalizedString("密码设置长度错误，需要32个字符", comment: ""))
+            }
+        }
+    }    //解密隐私数据的密码，默认为空不加密
     public static let defaultWindowLogger = HDWindowLoggerSwift(frame: CGRect.zero)
     public private(set) var mLogDataArray  = [HDWindowLoggerItem]()
     
@@ -265,9 +271,10 @@ public class HDWindowLoggerSwift: UIWindow, UITableViewDataSource, UITableViewDe
     }
     
     //MAKR:UITextFieldDelegate
-    public func textFieldDidEndEditing(_ textField: UITextField) {
+    public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         textField.resignFirstResponder()
         self.p_decrypt()
+        return true
     }
     
     //MARK:UITableViewDelegate
@@ -422,6 +429,8 @@ public class HDWindowLoggerSwift: UIWindow, UITableViewDataSource, UITableViewDe
     
     //解密
     @objc private func p_decrypt() {
+        self.mPasswordTextField.resignFirstResponder()
+        self.mSearchBar.resignFirstResponder()
         if self.mPasswordTextField.text != nil {
             self.mTableView.reloadData()
         }
diff --git a/HDWindowLoggerSwift/ViewController.swift b/HDWindowLoggerSwift/ViewController.swift
index 3a928f0..34b7b8f 100644
--- a/HDWindowLoggerSwift/ViewController.swift
+++ b/HDWindowLoggerSwift/ViewController.swift
@@ -30,7 +30,7 @@ class ViewController: UIViewController {
         //配置HDWindowLoggerSwift
         HDWindowLoggerSwift.show()
         HDWindowLoggerSwift.mCompleteLogOut = true
-        HDWindowLoggerSwift.mPrivacyPassword = "123456" //设置加密内容密码
+        HDWindowLoggerSwift.mPrivacyPassword = "12345678901234561234567890123456" //设置加密内容密码
     }
 
     @objc func onClickButton() {