Merge pull request #8 from LeoMobileDeveloper/v0.3.0

LeoMobileDeveloper · web-flow · commit 78c55176c4f3 · 2018-11-09T18:32:12.000+08:00
V0.3.0
diff --git a/Demo/Base.lproj/Main.storyboard b/Demo/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="4To-HN-DqI">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="4To-HN-DqI">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -58,18 +58,27 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DAf-9g-R9z">
-                                <rect key="frame" x="115" y="274.5" width="144" height="30"/>
+                                <rect key="frame" x="115.5" y="274.5" width="144" height="30"/>
                                 <state key="normal" title="Dispatch Notification"/>
                                 <connections>
                                     <action selector="dispatchNotification:" destination="UfB-hx-yKX" eventType="touchUpInside" id="XZN-wZ-wqm"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gzk-EX-vLV">
+                                <rect key="frame" x="134.5" y="356" width="106" height="30"/>
+                                <state key="normal" title="Dispatch String"/>
+                                <connections>
+                                    <action selector="dispatchString:" destination="UfB-hx-yKX" eventType="touchUpInside" id="8D8-wz-two"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="MXl-SO-nrb" firstAttribute="centerY" secondItem="gBg-dr-YJh" secondAttribute="centerY" id="0ee-IM-VqN"/>
+                            <constraint firstItem="Gzk-EX-vLV" firstAttribute="top" secondItem="MXl-SO-nrb" secondAttribute="bottom" constant="7.5" id="CxM-iL-nxJ"/>
                             <constraint firstItem="MXl-SO-nrb" firstAttribute="centerX" secondItem="gBg-dr-YJh" secondAttribute="centerX" id="DQZ-jE-IBh"/>
                             <constraint firstItem="DAf-9g-R9z" firstAttribute="centerX" secondItem="MXl-SO-nrb" secondAttribute="centerX" id="Dz4-ce-Yux"/>
+                            <constraint firstItem="Gzk-EX-vLV" firstAttribute="centerX" secondItem="MXl-SO-nrb" secondAttribute="centerX" id="fN7-kG-dEe"/>
                             <constraint firstItem="MXl-SO-nrb" firstAttribute="top" secondItem="DAf-9g-R9z" secondAttribute="bottom" constant="14" id="uup-6p-Jot"/>
                         </constraints>
                     </view>
diff --git a/Demo/DemoViewController.m b/Demo/DemoViewController.m
@@ -32,6 +32,9 @@ - (void)viewDidLoad {
      next:^(QTAppLifeCircleEvent *event) {
          NSLog(@"DemoViewController: %@",event.type);
     }];
+    [QTSubName(self, @"ButtonClickedEvent") next:^(NSString *event) {
+        NSLog(@"%@",@"Receive String Event");
+    }];
 }
 
 
@@ -47,6 +50,10 @@ - (IBAction)dispatchEvent:(id)sender {
     [[QTEventBus shared] dispatch:event];
 }
 
+- (IBAction)dispatchString:(id)sender {
+    [[QTEventBus shared] dispatch:@"ButtonClickedEvent"];
+}
+
 - (void)dealloc{
     NSLog(@"Dealloc: %@",NSStringFromClass(self.class));
 }
diff --git a/QTEventBus.podspec b/QTEventBus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'QTEventBus'
-  s.version          = '0.2.4'
+  s.version          = '0.3.0'
   s.summary          = '优雅的处理全局事件'
   s.description      = <<-DESC
                        优雅的处理全局事件,类型安全，支持同步/异步发送，同步/异步监听
diff --git a/QTEventBus.xcodeproj/project.pbxproj b/QTEventBus.xcodeproj/project.pbxproj
@@ -28,6 +28,8 @@
 		B34B70D720C4DC65006339C6 /* QTDisposeBag.h in Headers */ = {isa = PBXBuildFile; fileRef = B34B70D520C4DC65006339C6 /* QTDisposeBag.h */; };
 		B34B70D820C4DC65006339C6 /* QTDisposeBag.m in Sources */ = {isa = PBXBuildFile; fileRef = B34B70D620C4DC65006339C6 /* QTDisposeBag.m */; };
 		B36007B0211C4D3100250A2B /* UserService.m in Sources */ = {isa = PBXBuildFile; fileRef = B36007AF211C4D3100250A2B /* UserService.m */; };
+		B36440ED21957FFD00D4095B /* NSString+QTEevnt.h in Headers */ = {isa = PBXBuildFile; fileRef = B36440EB21957FFD00D4095B /* NSString+QTEevnt.h */; };
+		B36440EE21957FFD00D4095B /* NSString+QTEevnt.m in Sources */ = {isa = PBXBuildFile; fileRef = B36440EC21957FFD00D4095B /* NSString+QTEevnt.m */; };
 		B3C36A7320EDBA2A0087382E /* QTJsonEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = B3C36A7120EDBA2A0087382E /* QTJsonEvent.h */; };
 		B3C36A7420EDBA2A0087382E /* QTJsonEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = B3C36A7220EDBA2A0087382E /* QTJsonEvent.m */; };
 		B3CC766B20410C69006CA9C0 /* QTEventBus.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3CC766120410C69006CA9C0 /* QTEventBus.framework */; };
@@ -108,6 +110,8 @@
 		B34B70D620C4DC65006339C6 /* QTDisposeBag.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QTDisposeBag.m; sourceTree = "<group>"; };
 		B36007AE211C4D3100250A2B /* UserService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UserService.h; sourceTree = "<group>"; };
 		B36007AF211C4D3100250A2B /* UserService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserService.m; sourceTree = "<group>"; };
+		B36440EB21957FFD00D4095B /* NSString+QTEevnt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+QTEevnt.h"; sourceTree = "<group>"; };
+		B36440EC21957FFD00D4095B /* NSString+QTEevnt.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+QTEevnt.m"; sourceTree = "<group>"; };
 		B3C36A7120EDBA2A0087382E /* QTJsonEvent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QTJsonEvent.h; sourceTree = "<group>"; };
 		B3C36A7220EDBA2A0087382E /* QTJsonEvent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QTJsonEvent.m; sourceTree = "<group>"; };
 		B3CC766120410C69006CA9C0 /* QTEventBus.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = QTEventBus.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -212,6 +216,8 @@
 				B34B70D620C4DC65006339C6 /* QTDisposeBag.m */,
 				B3C36A7120EDBA2A0087382E /* QTJsonEvent.h */,
 				B3C36A7220EDBA2A0087382E /* QTJsonEvent.m */,
+				B36440EB21957FFD00D4095B /* NSString+QTEevnt.h */,
+				B36440EC21957FFD00D4095B /* NSString+QTEevnt.m */,
 			);
 			path = Core;
 			sourceTree = "<group>";
@@ -303,6 +309,7 @@
 				52182D2F212039D0007E39BE /* QTAppModuleManager.h in Headers */,
 				52182D2C212039D0007E39BE /* QTAppDelegate.h in Headers */,
 				52182D2D212039D0007E39BE /* QTAppEvents.h in Headers */,
+				B36440ED21957FFD00D4095B /* NSString+QTEevnt.h in Headers */,
 				B3CC767220410C69006CA9C0 /* QTEventBus.h in Headers */,
 				B34B70D720C4DC65006339C6 /* QTDisposeBag.h in Headers */,
 				52182D31212039D0007E39BE /* QTAppModule.h in Headers */,
@@ -466,6 +473,7 @@
 				B3C36A7420EDBA2A0087382E /* QTJsonEvent.m in Sources */,
 				52182D32212039D0007E39BE /* QTAppEvents.m in Sources */,
 				B3CC768020410E5F006CA9C0 /* QTEventBusCollection.m in Sources */,
+				B36440EE21957FFD00D4095B /* NSString+QTEevnt.m in Sources */,
 				B3D13C2A20C1512C008CEE54 /* NSObject+QTEventBus.m in Sources */,
 				52182D30212039D0007E39BE /* QTAppDelegate.m in Sources */,
 				B34B70D820C4DC65006339C6 /* QTDisposeBag.m in Sources */,
diff --git a/QTEventBusTests/QTBasicTests.m b/QTEventBusTests/QTBasicTests.m
@@ -30,6 +30,20 @@ - (void)tearDown {
     _eventBus = nil;
 }
 
+- (void)testStringEvent{
+    XCTestExpectation * expectation = [self expectationWithDescription:@"String test"];
+    id<QTEventToken> token;
+    token = [[self subscribeName:@"Event" on:self.eventBus] next:^(NSString *event) {
+        XCTAssert([event isEqualToString:@"Event"]);
+        [token dispose];
+        [expectation fulfill];
+    }];
+    [self.eventBus dispatch:@"Event"];
+    [self waitForExpectationsWithTimeout:10 handler:^(NSError * _Nullable error) {
+        
+    }];
+}
+
 - (void)testNormalEvent{
     XCTestExpectation * expectation = [self expectationWithDescription:@"Normal test"];
     id<QTEventToken> token;
diff --git a/Sources/Core/NSObject+QTEventBus.h b/Sources/Core/NSObject+QTEventBus.h
@@ -24,6 +24,16 @@
  */
 - (QTEventSubscriberMaker *)subscribe:(Class)eventClass on:(QTEventBus *)bus;
 
+/**
+ 在EventBus单例子监听指定字符串事件
+ */
+- (QTEventSubscriberMaker<NSString *> *)subscribeName:(NSString *)eventName;
+
+/**
+ 在bus上监听指定字符串时间
+ */
+- (QTEventSubscriberMaker<NSString *> *)subscribeName:(NSString *)eventName on:(QTEventBus *)bus;
+
 /**
  释放池
  */
diff --git a/Sources/Core/NSObject+QTEventBus.m b/Sources/Core/NSObject+QTEventBus.m
@@ -10,6 +10,7 @@
 #import "QTEventBus.h"
 #import <objc/runtime.h>
 #import <UIKit/UIKit.h>
+#import "NSString+QTEevnt.h"
 
 static const char event_bus_disposeContext;
 
@@ -24,6 +25,16 @@ - (QTDisposeBag *)eb_disposeBag{
     return bag;
 }
 
+- (QTEventSubscriberMaker *)subscribeName:(NSString *)eventName{
+    NSParameterAssert(eventName != nil);
+    return [QTEventBus shared].on(NSString.class).ofSubType(eventName).freeWith(self);
+}
+
+- (QTEventSubscriberMaker *)subscribeName:(NSString *)eventName on:(QTEventBus *)bus{
+    NSParameterAssert(eventName != nil);
+    return bus.on(NSString.class).ofSubType(eventName).freeWith(self);
+}
+
 - (QTEventSubscriberMaker *)subscribe:(Class)eventClass{
     return [QTEventBus shared].on(eventClass).freeWith(self);
 }
diff --git a/Sources/Core/NSString+QTEevnt.h b/Sources/Core/NSString+QTEevnt.h
@@ -0,0 +1,18 @@
+//
+//  NSString+QTEevnt.h
+//  QTEventBus
+//
+//  Created by Leo on 2018/11/9.
+//  Copyright © 2018 Leo Huang. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "QTEventTypes.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NSString (QTEevnt)<QTEvent>
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/Sources/Core/NSString+QTEevnt.m b/Sources/Core/NSString+QTEevnt.m
@@ -0,0 +1,21 @@
+//
+//  NSString+QTEevnt.m
+//  QTEventBus
+//
+//  Created by Leo on 2018/11/9.
+//  Copyright © 2018 Leo Huang. All rights reserved.
+//
+
+#import "NSString+QTEevnt.h"
+
+@implementation NSString (QTEevnt)
+
+- (NSString *)eventSubType{
+    return [self copy];
+}
+
++ (Class)eventClass{
+    return [NSString class];
+}
+
+@end
diff --git a/Sources/Core/QTEventBus.h b/Sources/Core/QTEventBus.h
@@ -11,9 +11,11 @@
 #import "QTJsonEvent.h"
 #import "NSNotification+QTEvent.h"
 #import "NSObject+QTEventBus.h"
+#import "NSString+QTEevnt.h"
 
-//监听，监听的生命周期和object一样
+//单例监听，监听的生命周期和object一样
 #define QTSub(_object_,_className_) ((QTEventSubscriberMaker<_className_ *> *)[_object_ subscribe:[_className_ class]])
+#define QTSubName(_object_,_name_) ([_object_ subscribeName:_name_])
 //异步在主线程监听
 #define QTSubMain(_object_,_className_) ([QTSub(_object_, _className_) atQueue:dispatch_get_main_queue()])
 //监听NSNotification

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ - (void)viewDidLoad {`
`32`	`32`	`next:^(QTAppLifeCircleEvent *event) {`
`33`	`33`	`NSLog(@"DemoViewController: %@",event.type);`
`34`	`34`	`}];`
	`35`	`+ [QTSubName(self, @"ButtonClickedEvent") next:^(NSString *event) {`
	`36`	`+ NSLog(@"%@",@"Receive String Event");`
	`37`	`+ }];`
`35`	`38`	`}`
`36`	`39`
`37`	`40`
`@@ -47,6 +50,10 @@ - (IBAction)dispatchEvent:(id)sender {`
`47`	`50`	`[[QTEventBus shared] dispatch:event];`
`48`	`51`	`}`
`49`	`52`
	`53`	`+- (IBAction)dispatchString:(id)sender {`
	`54`	`+ [[QTEventBus shared] dispatch:@"ButtonClickedEvent"];`
	`55`	`+}`
	`56`	`+`
`50`	`57`	`- (void)dealloc{`
`51`	`58`	`NSLog(@"Dealloc: %@",NSStringFromClass(self.class));`
`52`	`59`	`}`