地址管理处理

RainbowPlanet/RainbowPlanet/Modules/MineModule/AddressManager/ViewController/AddressManagerViewController.swift

@@ -14,6 +14,11 @@ enum AddressManagerVCType {
 
 class AddressManagerViewController: BaseViewController {
     
+    deinit {
+        NotificationCenter.default.removeObserver(observe!)
+    }
+    weak var observe : NSObjectProtocol?
+    
     var addressManagerVCType : AddressManagerVCType = .mine
     var addressManagerListModel : AddressManagerListModel?
     var isOpenCity : Bool = false
@@ -38,6 +43,9 @@ class AddressManagerViewController: BaseViewController {
     }
     
     override func setupData() {
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("editAddress"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
+            self?.configCityManagementIndexApi()
+        }
         addressManagerView.tableView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
             [weak self](page) in
             self?.configCityManagementIndexApi()
@@ -130,9 +138,6 @@ class AddressManagerViewController: BaseViewController {
             if self.addressManagerVCType == .mine {
                 let vc = EditExpressAddressViewController()
                 vc.expressAddresModel = self.addressManagerListModel?.expressAddress?[indexPath.row]
-                vc.upAddressListClosure = {
-                    self.configCityManagementIndexApi()
-                }
                 self.navigationController?.pushViewController(vc, animated: true)
             }else {
                 let expressAddressModel = self.addressManagerListModel?.expressAddress?[indexPath.row]

RainbowPlanet/RainbowPlanet/Modules/MineModule/EditExpressAddress/ViewController/EditExpressAddressViewController.swift

@@ -9,10 +9,6 @@
 import UIKit
 
 class EditExpressAddressViewController: BaseViewController {
-
-    
-    typealias UpAddressListClosure = () -> Void
-    var upAddressListClosure : UpAddressListClosure?
     
     var expressAddresModel: ExpressAddresModel?
     
@@ -72,9 +68,7 @@ class EditExpressAddressViewController: BaseViewController {
     }
     
     func popVC() {
-        if let upAddressListClosure = self.upAddressListClosure {
-            upAddressListClosure()
-        }
+        NotificationCenter.default.post(name: NSNotification.Name("editAddress"), object: self)
         self.navigationController?.popViewController(animated: true)
     }
 }

RainbowPlanet/RainbowPlanet/Modules/MineModule/ExpressAddressList/ViewController/ExpressAddressListViewController.swift

@@ -10,9 +10,12 @@ import UIKit
 
 class ExpressAddressListViewController: BaseViewController {
 
+    deinit {
+        NotificationCenter.default.removeObserver(observe!)
+    }
+    weak var observe : NSObjectProtocol?
     var addressManagerListModel : AddressManagerListModel?
-
-    
+   
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -27,10 +30,6 @@ class ExpressAddressListViewController: BaseViewController {
         navigationBar.onClickRightButton = {
             [weak self] in
            let vc = EditExpressAddressViewController()
-            vc.upAddressListClosure = {
-                [weak self] in
-                self?.userExpressAddressListApi()
-            }
             self?.navigationController?.pushViewController(vc, animated: true)
         }
         view.addSubview(expressAddressListView)
@@ -44,6 +43,9 @@ class ExpressAddressListViewController: BaseViewController {
     }
     
     override func setupData() {
+        observe = NotificationCenter.default.addObserver(forName: NSNotification.Name("editAddress"), object: nil, queue: OperationQueue.main) {[weak self] (notification) in
+            self?.userExpressAddressListApi()
+        }
         self.expressAddressListView.tableView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
             [weak self](page) in
             self?.userExpressAddressListApi()
@@ -56,10 +58,6 @@ class ExpressAddressListViewController: BaseViewController {
             [weak self] indexPath in
             let vc = EditExpressAddressViewController()
             vc.expressAddresModel = self?.addressManagerListModel?.expressAddress![indexPath.row]
-            vc.upAddressListClosure = {
-                [weak self] in
-                self?.userExpressAddressListApi()
-            }
             self?.navigationController?.pushViewController(vc, animated: true)
         }
         expressAddressListView.didSelectRowClosure = {

RainbowPlanet/RainbowPlanet/Tools/SwiftProgressHUD/SwiftProgressHUD.swift

@@ -74,7 +74,6 @@ class SwiftProgressHUD: NSObject {
         hud.margin = 10
         //HUD窗口显示1秒后自动隐藏
         hud.hide(animated: true, afterDelay: TimeInterval(afterDelay))
-        self.hud = hud
 
     }
 
@@ -90,7 +89,6 @@ class SwiftProgressHUD: NSObject {
         hud.removeFromSuperViewOnHide = true
         //HUD窗口显示1秒后自动隐藏
         hud.hide(animated: true, afterDelay: TimeInterval(afterDelay))
-        self.hud = hud
     }
 
     /// 显示警告消息
@@ -105,7 +103,6 @@ class SwiftProgressHUD: NSObject {
         hud.removeFromSuperViewOnHide = true
         //HUD窗口显示1秒后自动隐藏
         hud.hide(animated: true, afterDelay: TimeInterval(afterDelay))
-        self.hud = hud
     }
 
 
@@ -121,7 +118,6 @@ class SwiftProgressHUD: NSObject {
         hud.removeFromSuperViewOnHide = true
         //HUD窗口显示1秒后自动隐藏
         hud.hide(animated: true, afterDelay: TimeInterval(afterDelay))
-        self.hud = hud
     }
 
     /// 隐藏