update pods

lovemo · Mar 10, 2016 · 6e89a64 · 6e89a64
1 parent b6543e4
commit 6e89a64
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 28 deletions.
diff --git a/SwiftMVVMKit.podspec b/SwiftMVVMKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name                  = 'SwiftMVVMKit'
-    s.version      = '0.0.4'
+    s.version      = '0.0.5'
     s.summary               = 'SwiftMVVMKit is a MVVM frameWork easy to develop iOS'
     s.homepage              = 'https://github.com/lovemo/MVVMFramework-Swift'
     s.platform     = :ios, '8.0'

diff --git a/SwiftMVVMKit/Base/ViewManger/SMKBaseViewManger.swift b/SwiftMVVMKit/Base/ViewManger/SMKBaseViewManger.swift
@@ -13,12 +13,4 @@ class SMKBaseViewManger: NSObject, SMKViewMangerProtocolDelegate {
     /// 用于传递数据的基模型
     var smk_model: NSObject?
 
-    override init() {
-        super.init()
-        self.smk_viewMangerWithSubView(nil)
-    }
-
-    func smk_viewMangerWithSubView(subView: UIView?) {
-
-    }
 }
diff --git a/SwiftMVVMKit/Protocol/SMKViewMangerProtocolDelegate.swift b/SwiftMVVMKit/Protocol/SMKViewMangerProtocolDelegate.swift
@@ -65,5 +65,12 @@ import UIKit
      使子视图更新到最新的布局约束或者frame
      */
     optional func smk_viewMangerWithUpdateLayoutSubViews()
+
+    /**
+     将model数据传递给viewManger
+     
+     - parameter dictBlock: dictBlock description
+     */
+    optional func viewMangerWithModel(dictBlock: (( ) -> [NSObject : AnyObject]?)?)
 }
 
diff --git a/SwiftMVVMKitDemo/.DS_Store b/SwiftMVVMKitDemo/.DS_Store
diff --git a/SwiftMVVMKitDemo/SwiftMVVMKitDemo/Classes/Src/thirdExample/Controller/ThirdVC.swift b/SwiftMVVMKitDemo/SwiftMVVMKitDemo/Classes/Src/thirdExample/Controller/ThirdVC.swift
@@ -22,7 +22,9 @@ class ThirdVC: UIViewController {
     }
 
     @IBAction func clickBtnAction(sender: UIButton) {
-        self.thirdViewManger.smk_model = self.viewModel.getRandomData()
+        self.thirdViewManger.viewMangerWithModel { () -> [NSObject : AnyObject]? in
+            return ["model": self.viewModel.getRandomData()!]
+        }
     }
 
 }
diff --git a/SwiftMVVMKitDemo/SwiftMVVMKitDemo/Classes/Src/thirdExample/ViewManger/ThirdViewManger.swift b/SwiftMVVMKitDemo/SwiftMVVMKitDemo/Classes/Src/thirdExample/ViewManger/ThirdViewManger.swift
@@ -9,23 +9,20 @@
 import UIKit
 import SwiftExtensionKit
 
-class ThirdViewManger: SMKBaseViewManger, SMKViewProtocolDelegate {
+class ThirdViewManger: NSObject, SMKViewMangerProtocolDelegate, SMKViewProtocolDelegate {
 
     lazy var thirdView = ThirdView.loadInstanceFromNib() as? ThirdView
+    lazy var dict = [ : ]
 
     override init() {
         super.init()
-        thirdView?.delegate = self
-    }
-
-    // 两种消息传递方式，开发时任选其一即可，处理View中自定义的事件
-    override func smk_viewMangerWithSubView(subView: UIView?) {
 
+        thirdView?.delegate = self
         // btnClickBlock
         thirdView?.viewEventsBlock = { (events: AnyObject...) -> ( ) in
-                for event in events {
-                    print(event)
-                }
+            for event in events {
+                print(event)
+            }
             self.smk_viewMangerWithHandleOfSubView(self.thirdView!, info: "click")
         }
     }
@@ -52,8 +49,15 @@ class ThirdViewManger: SMKBaseViewManger, SMKViewProtocolDelegate {
     // 根据传入的info设置添加subView的事件
     func smk_viewMangerWithHandleOfSubView(subView: UIView, info: String?) {
         if info == "click" {
-            subView.configureViewWithCustomObj(smk_model)
+            subView.configureViewWithCustomObj(dict["model"] as? NSObject)
+        }
+    }
+    // 得到传入的模型数据
+    func viewMangerWithModel(dictBlock: (() -> [NSObject : AnyObject]?)?) {
+        if let _ = dictBlock {
+            dict = dictBlock!()!
         }
     }
+
 
 }
diff --git a/SwiftMVVMKitDemo/SwiftMVVMKitDemo/SwiftMVVMKit/Base/ViewManger/SMKBaseViewManger.swift b/SwiftMVVMKitDemo/SwiftMVVMKitDemo/SwiftMVVMKit/Base/ViewManger/SMKBaseViewManger.swift
@@ -13,12 +13,4 @@ class SMKBaseViewManger: NSObject, SMKViewMangerProtocolDelegate {
     /// 用于传递数据的基模型
     var smk_model: NSObject?
 
-    override init() {
-        super.init()
-        self.smk_viewMangerWithSubView(nil)
-    }
-
-    func smk_viewMangerWithSubView(subView: UIView?) {
-
-    }
 }
diff --git a/SwiftMVVMKitDemo/SwiftMVVMKitDemo/SwiftMVVMKit/Protocol/SMKViewMangerProtocolDelegate.swift b/SwiftMVVMKitDemo/SwiftMVVMKitDemo/SwiftMVVMKit/Protocol/SMKViewMangerProtocolDelegate.swift
@@ -65,5 +65,12 @@ import UIKit
      使子视图更新到最新的布局约束或者frame
      */
     optional func smk_viewMangerWithUpdateLayoutSubViews()
+
+    /**
+     将model数据传递给viewManger
+     
+     - parameter dictBlock: dictBlock description
+     */
+    optional func viewMangerWithModel(dictBlock: (( ) -> [NSObject : AnyObject]?)?)
 }