增加部分注释

Author: Larry Tin

GDDataDrivenView.podspec

@@ -52,7 +52,6 @@ TODO: Add long description of the pod here.
   s.subspec 'ViewControllerPresenter' do |sp|
     sp.dependency 'GDDataDrivenView/MVP'
     sp.dependency 'GDDataDrivenView/Generated'
-    sp.dependency 'GDChannel', '~> 0.6'
     sp.dependency 'Aspects', '~> 1.4.1'
 
     sp.source_files = 'GDDataDrivenView/Classes/ViewControllerPresenter/**/*'

GDDataDrivenView/Classes/MVP/GDDPresenter.h

@@ -2,18 +2,22 @@
 // Created by Larry Tin on 16/9/20.
 //
 
-#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 @protocol GDDView;
 
 @protocol GDDPresenter
 
-- (void)update:(id <GDDView>)view withData:(id)data;
+/**
+ * @param viewController viewDidLoad 这时已被调用
+ * @param data
+ */
+- (void)update:(UIViewController<GDDView> *)viewController withData:(id)data;
 
 @optional
 /**
- * @param owner 使用弱引用持有, 否则将导致循环引用
- * @return
+ * 必须在 UIViewController 的 init 初始化阶段创建 Presenter
+ * @param owner 使用弱引用持有 owner, 否则将导致循环引用
  */
 - (instancetype)initWithOwner:(id)owner;
 
-@end
+@end

GDDataDrivenView/Classes/MVP/GDDView.h

@@ -12,7 +12,6 @@
  * @return 当不实现该方法时, 默认根据类名约定查找并复用之前已创建的 Presenter 实例, 若不存在则创建新的实例并缓存
  *
  *   XyzViewController -> XyzPresenter
- *   AbcRender -> AbcPresenter
  *
  */
 - (id <GDDPresenter>)presenter;

GDDataDrivenView/Classes/MVP/GDDViewPresenter.h

@@ -7,7 +7,7 @@
 
 @protocol GDDViewPresenter <GDDPresenter>
 
-- (void)update:(id)view withData:(id)data;
+- (void)update:(UIView<GDDView> *)view withData:(id)data;
 
 @optional
 - (UIView *) view;

GDDataDrivenView/Classes/RenderPresenter/GDDRender.h

@@ -4,7 +4,17 @@
 
 #import <Foundation/Foundation.h>
 #import "GDDView.h"
+#import "GDDRenderPresenter.h"
 
 @protocol GDDRender <GDDView>
 
+@optional
+/**
+ * @return 当不实现该方法时, 默认根据类名约定查找并复用之前已创建的 RenderPresenter 实例, 若不存在则创建新的实例并缓存
+ *
+ *   AbcRender -> AbcPresenter
+ *
+ */
+- (id <GDDRenderPresenter>)presenter;
+
 @end

GDDataDrivenView/Classes/Renders/GDDUnknownCellRender.h

@@ -8,6 +8,4 @@
 
 @interface GDDUnknownCellRender : UITableViewCell <GDDRender, GDDRenderPresenter>
 
-@property (strong, nonatomic) IBOutlet UILabel *descriptionLabel;
-
 @end

GDDataDrivenView/Classes/Renders/GDDUnknownCellRender.m

@@ -5,6 +5,10 @@
 #import "GDDUnknownCellRender.h"
 #import "UITableViewCell+GDDRender.h"
 
+@interface GDDUnknownCellRender ()
+@property (strong, nonatomic) UILabel *descriptionLabel;
+@end
+
 @implementation GDDUnknownCellRender {
 //  BOOL _didSetupConstraints;
   NSLayoutConstraint *_heightConstraint;

GDDataDrivenView/Classes/ViewControllerPresenter/GDDViewControllerTransition.h

@@ -13,9 +13,18 @@ enum GDDViewControllerTransitionStackMode {
   PUSH, PRESENT, PRESENT_THEN_PUSH
 };
 
+/**
+ * 当不存在于历史堆栈中时, 使用该模式进行显示
+ */
 - (void (^)(enum GDDViewControllerTransitionStackMode stackMode))by;
+/**
+ * 作为 UIWindow 的 rootViewController
+ */
 - (void (^)())asRoot;
 
+/**
+ * 适用于 ViewController 已存在于历史堆栈中的情况
+ */
 - (void (^)(BOOL bringToFront))refresh;
 
 @end
@@ -26,8 +35,17 @@ NS_ASSUME_NONNULL_BEGIN
 - (GDDViewControllerTransition *(^)(id data))data;
 - (GDDViewControllerTransition *(^)(GDDPBViewOption *viewOption))viewOption;
 
+/**
+ * 总是创建新的 ViewController 实例, 并显示
+ */
 - (id<GDDTransitionBuilder> (^)(Class viewControllerClass))to;
+/**
+ * 先检查历史堆栈中是否存在该类型的 ViewController, 若存在则回退至可见; 若不存在则先创建再显示
+ */
 - (id<GDDTransitionBuilder> (^)(Class viewControllerClass))toSingleton;
+/**
+ * 先检查历史堆栈中是否存在该 ViewController, 若存在则回退至可见; 若不存在则先创建再显示
+ */
 - (id<GDDTransitionBuilder> (^)(UIViewController *viewController))toInstance;
 
 /**
@@ -40,8 +58,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void (^)())toCurrent;
 
 /**
- * 返回当前可见的 View Controller
- * @return
+ * @return 当前可见的 ViewController
  */
 + (UIViewController *)topViewController;
 

GDDataDrivenView/Classes/ViewControllerPresenter/GDDViewControllerTransition.m

@@ -4,7 +4,6 @@
 
 #import "GDDViewControllerTransition.h"
 #import <objc/runtime.h>
-#import "GDCMessageHandler.h"
 
 // The address of this variable is used as a key for obj_getAssociatedObject.
 static const char kPresenterKey = 0;
@@ -36,7 +35,7 @@ @implementation GDDViewControllerTransition {
 
 - (id <GDDTransitionBuilder> (^)(Class viewControllerClass))to {
   return ^id <GDDTransitionBuilder>(Class viewControllerClass) {
-      _viewController = [viewControllerClass instancesRespondToSelector:@selector(initWithPayload:)] ? [[viewControllerClass alloc] initWithPayload:_data] : [[viewControllerClass alloc] init];
+      _viewController = [[viewControllerClass alloc] init];
       return self;
   };
 }
@@ -152,10 +151,6 @@ - (void)displayAndRefresh {
 
     if (!shouldPush) {
       // 动画: 仅在 present 时有效
-//      if (viewOptions.transition) {
-//        controller.transitioningDelegate = viewOptions.transition;
-//        controller.modalPresentationStyle = UIModalPresentationCustom;
-//      }
       controller.modalTransitionStyle = _viewOption.modalTransitionStyle;
       controller.modalPresentationStyle = _viewOption.modalPresentationStyle;
     }
@@ -168,14 +163,14 @@ - (void)displayAndRefresh {
         if (!controller.isViewLoaded) {
           [controller view]; // force viewDidLoad to be called
         }
-        [presenter update:(id <GDDView>) controller withData:_data];
+        [presenter update:controller withData:_data];
     });
     return;
   }
 
   [self config:YES]; // 某些 ViewOption 需要在 present 之前设置才会生效
   [top presentViewController:_stackMode == PRESENT ? controller : [[UINavigationController alloc] initWithRootViewController:controller] animated:YES completion:^{
-      [presenter update:(id <GDDView>) controller withData:_data];
+      [presenter update:controller withData:_data];
   }];
   [self config:NO];
 }
@@ -209,9 +204,6 @@ - (void)config:(BOOL)eagerly {
   if (toolBar != GDPBBool_Default && GDPBBool_IsValidValue(toolBar)) {
     [controller.navigationController setToolbarHidden:toolBar == GDPBBool_False animated:NO];
   }
-//  if (options[optionStatusBarOrientation]) {
-//    [[UIApplication sharedApplication] setStatusBarOrientation:(UIInterfaceOrientation) [options[optionStatusBarOrientation] integerValue]];
-//  }
   if (viewOption.deviceOrientation) {
     viewOption.deviceOrientation = UIDeviceOrientationUnknown;
     [[UIDevice currentDevice] setValue:@(viewOption.deviceOrientation) forKey:@"orientation"];
@@ -251,7 +243,7 @@ + (void)replaceRootViewController:(UIViewController *)controller {
   if (rootViewController.presentedViewController) { // 避免内存泄漏, 以释放 rootViewController 和 rootViewController.presentedViewController
     [rootViewController dismissViewControllerAnimated:YES completion:nil];
   }
-  UIApplication.sharedApplication.keyWindow.rootViewController = controller;
+  UIApplication.sharedApplication.delegate.window.rootViewController = controller; // keyWindow 在 makeKeyAndVisible 执行前为nil
 }
 
 + (UIViewController *)findViewController:(Class)viewControllerClass {