Merge pull request #49 from alibaba/release/1.2.0

Release/1.2.0

BeeHive.podspec

@@ -2,7 +2,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "BeeHive"
-  s.version      = "1.1.2"
+  s.version      = "1.2.0"
   s.summary      = "BeeHive is a kind of modular programming method"
 
   s.description  = <<-DESC

BeeHive/BHAnnotation.h

@@ -1,10 +1,11 @@
-//
-//  BHAnnotation.h
-//  Pods
-//
-//  Created by 寻峰 on 2016/11/5.
-//
-//
+/**
+ * Created by BeeHive.
+ * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
+ *
+ * This source code is licensed under the GNU GENERAL PUBLIC LICENSE.
+ * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
+ */
+
 
 #import <Foundation/Foundation.h>
 

BeeHive/BHAnnotation.m

@@ -1,10 +1,11 @@
-//
-//  BHAnnotation.m
-//  Pods
-//
-//  Created by 寻峰 on 2016/11/5.
-//
-//
+/**
+ * Created by BeeHive.
+ * Copyright (c) 2016, Alibaba, Inc. All rights reserved.
+ *
+ * This source code is licensed under the GNU GENERAL PUBLIC LICENSE.
+ * For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
+ */
+
 
 #import "BHAnnotation.h"
 #import "BHCommon.h"

BeeHive/BHAppDelegate.m

@@ -15,8 +15,6 @@
 
 @interface BHAppDelegate ()
 
-@property (nonatomic, strong) BHTimeProfiler *timeProfiler;
-
 @end
 
 @implementation BHAppDelegate
@@ -26,9 +24,6 @@ @implementation BHAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-#ifdef DEBUG
-    self.timeProfiler = [BHTimeProfiler sharedTimeProfiler];
-#endif
 
     [[BHModuleManager sharedManager] triggerEvent:BHMSetupEvent];
     [[BHModuleManager sharedManager] triggerEvent:BHMInitEvent];
@@ -38,8 +33,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     });
 
 #ifdef DEBUG
-    [self.timeProfiler printOutTimeProfileResult];
-    [self.timeProfiler saveTimeProfileDataIntoFile:@"BeeHiveTimeProfiler"];
+    [[BHTimeProfiler sharedTimeProfiler] printOutTimeProfileResult];
+    [[BHTimeProfiler sharedTimeProfiler] saveTimeProfileDataIntoFile:@"BeeHiveTimeProfiler"];
 #endif
 
     return YES;

BeeHive/BHContext.h

@@ -41,10 +41,6 @@ typedef enum
 
 @property(nonatomic, strong) NSString *serviceConfigName;
 
-@property(nonatomic, strong) NSMutableDictionary *modulesByName;
-
-@property(nonatomic, strong) NSMutableDictionary *servicesByName;
-
 //3D-Touch model
 #if __IPHONE_OS_VERSION_MAX_ALLOWED > 80400
 @property (nonatomic, strong) BHShortcutItem *touchShortcutItem;
@@ -59,7 +55,10 @@ typedef enum
 //user Activity Model
 @property (nonatomic, strong) BHUserActivityItem *userActivityItem;
 
-+(instancetype) shareInstance;
++ (instancetype)shareInstance;
+
+- (void)addServiceWithImplInstance:(id)implInstance serviceName:(NSString *)serviceName;
 
+- (id)getServiceInstanceFromServiceName:(NSString *)serviceName;
 
 @end

BeeHive/BHContext.m

@@ -8,16 +8,42 @@
 
 #import "BHContext.h"
 
-
 @interface BHContext()
 
+@property(nonatomic, strong) NSMutableDictionary *modulesByName;
 
+@property(nonatomic, strong) NSMutableDictionary *servicesByName;
 
 @end
 
 @implementation BHContext
 
--(instancetype)init
++ (instancetype)shareInstance
+{
+    static dispatch_once_t p;
+    static id BHInstance = nil;
+
+    dispatch_once(&p, ^{
+        BHInstance = [[[self class] alloc] init];
+        if ([BHInstance isKindOfClass:[BHContext class]]) {
+            ((BHContext *) BHInstance).config = [BHConfig shareInstance];
+        }
+    });
+
+    return BHInstance;
+}
+
+- (void)addServiceWithImplInstance:(id)implInstance serviceName:(NSString *)serviceName
+{
+    [[BHContext shareInstance].servicesByName setObject:implInstance forKey:serviceName];
+}
+
+- (id)getServiceInstanceFromServiceName:(NSString *)serviceName
+{
+    return [[BHContext shareInstance].servicesByName objectForKey:serviceName];
+}
+
+- (instancetype)init
 {
     self = [super init];
     if (self) {
@@ -38,20 +64,4 @@ -(instancetype)init
     return self;
 }
 
-+(instancetype) shareInstance
-{
-    static dispatch_once_t p;
-    static id BHInstance = nil;
-
-    dispatch_once(&p, ^{
-        BHInstance = [[[self class] alloc] init];
-        if ([BHInstance isKindOfClass:[BHContext class]]) {
-            ((BHContext *) BHInstance).config = [BHConfig shareInstance];
-        }
-    });
-
-    return BHInstance;
-}
-
-
 @end

BeeHive/BHModuleManager.h

@@ -8,8 +8,6 @@
 
 #import <Foundation/Foundation.h>
 
-@class BHContext;
-
 typedef NS_ENUM(NSUInteger, BHModuleLevel)
 {
     BHModuleBasic  = 0,
@@ -48,11 +46,6 @@ typedef NS_ENUM(NSInteger, BHModuleEventType)
 
 @interface BHModuleManager : NSObject
 
-@property (nonatomic, strong) NSString *modulesConfigFilename;
-
-@property (nonatomic, strong) BHContext           *wholeContext;
-
-
 + (instancetype)sharedManager;
 
 // If you do not comply with set Level protocol, the default Normal

BeeHive/BHModuleManager.m

@@ -47,7 +47,6 @@ @interface BHModuleManager()
 
 @property(nonatomic, strong)  NSMutableArray      *BHModules;
 
-
 @end
 
 @implementation BHModuleManager
@@ -59,15 +58,15 @@ + (instancetype)sharedManager
     static id sharedManager = nil;
     static dispatch_once_t onceToken = 0;
     dispatch_once(&onceToken, ^{
-        sharedManager = [[self alloc] init];
+        sharedManager = [[BHModuleManager alloc] init];
     });
     return sharedManager;
 }
 
 - (void)loadLocalModules
 {
 
-    NSString *plistPath = [[NSBundle mainBundle] pathForResource:self.modulesConfigFilename ofType:@"plist"];
+    NSString *plistPath = [[NSBundle mainBundle] pathForResource:[BHContext shareInstance].moduleConfigName ofType:@"plist"];
     if (![[NSFileManager defaultManager] fileExistsAtPath:plistPath]) {
         return;
     }
@@ -285,17 +284,6 @@ - (void)addModuleFromObject:(id)object
 
 #pragma mark - property setter or getter
 
-- (void)setModulesConfigFilename:(NSString *)modulesConfigFilename
-{
-    _modulesConfigFilename = modulesConfigFilename;
-}
-
-- (void)setWholeContext:(BHContext *)wholeContext
-{
-    _wholeContext = wholeContext;
-    self.modulesConfigFilename = _wholeContext.moduleConfigName;
-}
-
 - (NSMutableArray *)BHModules
 {
     if (!_BHModules) {
@@ -316,7 +304,7 @@ - (void)handleModulesInitEvent
             __strong typeof(&*self) sself = wself;
             if (sself) {
                 if ([moduleInstance respondsToSelector:@selector(modInit:)]) {
-                    [moduleInstance modInit:sself.wholeContext];
+                    [moduleInstance modInit:[BHContext shareInstance]];
                 }
             }
         };
@@ -346,7 +334,7 @@ - (void)handleModulesTearDownEvent
     for (int i = (int)self.BHModules.count - 1; i >= 0; i--) {
         id<BHModuleProtocol> moduleInstance = [self.BHModules objectAtIndex:i];
         if (moduleInstance && [moduleInstance respondsToSelector:@selector(modTearDown:)]) {
-            [moduleInstance modTearDown:self.wholeContext];
+            [moduleInstance modTearDown:[BHContext shareInstance]];
         }
     }
 }
@@ -358,7 +346,7 @@ - (void)handleModuleEvent:(NSString *)selectorStr
         if ([moduleInstance respondsToSelector:seletor]) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-            [moduleInstance performSelector:seletor withObject:self.wholeContext];
+            [moduleInstance performSelector:seletor withObject:[BHContext shareInstance]];
 #pragma clang diagnostic pop
 
         [[BHTimeProfiler sharedTimeProfiler] recordEventTime:[NSString stringWithFormat:@"%@ --- %@", [moduleInstance class], NSStringFromSelector(seletor)]];

BeeHive/BHServiceManager.h

@@ -12,11 +12,8 @@
 
 @interface BHServiceManager : NSObject
 
-@property (nonatomic, strong) BHContext           *wholeContext;
-
 @property (nonatomic, assign) BOOL  enableException;
 
-
 + (instancetype)sharedManager;
 
 - (void)registerLocalServices;

BeeHive/BHServiceManager.m

@@ -30,19 +30,11 @@ + (instancetype)sharedManager
     return sharedManager;
 }
 
-- (instancetype)init
-{
-    self = [super init];
-    if (self) {
-    }
-    return self;
-}
-
 - (void)registerLocalServices
 {
-    NSString *serviceConfigName = self.wholeContext.serviceConfigName;
+    NSString *serviceConfigName = [BHContext shareInstance].serviceConfigName;
 
-    NSString *plistPath = [[NSBundle mainBundle] pathForResource:serviceConfigName  ofType:@"plist"];
+    NSString *plistPath = [[NSBundle mainBundle] pathForResource:serviceConfigName ofType:@"plist"];
     if (!plistPath) {
         return;
     }
@@ -122,16 +114,16 @@ - (id)createService:(Protocol *)service
     NSString *serviceStr = NSStringFromProtocol(service);
 
     if ([implInstance singleton]) {
-        id protocol = [[BHContext shareInstance].servicesByName objectForKey:serviceStr];
+        id protocol = [[BHContext shareInstance] getServiceInstanceFromServiceName:serviceStr];
 
         if (protocol) {
             return protocol;
         } else {
-            [[BHContext shareInstance].servicesByName setObject:implInstance forKey:serviceStr];
+            [[BHContext shareInstance] addServiceWithImplInstance:implInstance serviceName:serviceStr];
         }
 
     } else {
-        [[BHContext shareInstance].servicesByName setObject:implInstance forKey:serviceStr];
+        [[BHContext shareInstance] addServiceWithImplInstance:implInstance serviceName:serviceStr];
     }
 
     return implInstance;
@@ -181,7 +173,7 @@ - (NSRecursiveLock *)lock
 - (NSArray *)servicesArray
 {
     [self.lock lock];
-    NSArray *array = [self.allServices mutableCopy];
+    NSArray *array = [self.allServices copy];
     [self.lock unlock];
     return array;
 }

BeeHive/BeeHive.m

@@ -8,14 +8,6 @@
 
 #import "BeeHive.h"
 
-
-//BootLoader
-
-@interface BeeHive()
-
-@end
-
-
 @implementation BeeHive
 
 #pragma mark - public
@@ -63,7 +55,6 @@ -(void)setContext:(BHContext *)context
 
 - (void)loadStaticModules
 {
-    [[BHModuleManager sharedManager] setWholeContext:self.context];
 
     [[BHModuleManager sharedManager] loadLocalModules];
 
@@ -77,16 +68,18 @@ -(void)loadStaticServices
 {
     [BHServiceManager sharedManager].enableException = self.enableException;
 
-    [[BHServiceManager sharedManager] setWholeContext:self.context];
-
     [[BHServiceManager sharedManager] registerLocalServices];
 
     [[BHServiceManager sharedManager] registerAnnotationServices];
 
 }
-- (void)tiggerCustomEvent:(NSInteger)eventType{
-    if(eventType<1000)
-    return;
+
+- (void)tiggerCustomEvent:(NSInteger)eventType
+{
+    if(eventType < 1000) {
+        return;
+    }
+
     [[BHModuleManager sharedManager] triggerEvent:eventType];
 }