Merge pull request #894 from didi/feature/ios-mc

自定义 手势

iOS/DoraemonKit/Src/MultiControl/Function/Dispatcher/DoraemonMCCommandExcutor.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import "DoraemonMCMessagePackager.h"
-
+#import "DoraemonMCEventHandler.h"
 NS_ASSUME_NONNULL_BEGIN
 
 @interface DoraemonMCCommandExcutor : NSObject
@@ -17,6 +17,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (void)excuteMessage:(DoraemonMCMessage *)message;
 
+
+//增加自定义事件
++ (void)addCustomMessage:(NSString *)type eventHandlerName:(DoraemonMCEventHandler *)eventHandler;
+
 @end
 
 NS_ASSUME_NONNULL_END

iOS/DoraemonKit/Src/MultiControl/Function/Dispatcher/DoraemonMCCommandExcutor.m

@@ -8,6 +8,9 @@
 #import "DoraemonMCCommandExcutor.h"
 #import "DoraemonMCEventHandler.h"
 
+static NSMutableDictionary *eventHandlerMap = nil;
+static NSMutableDictionary *externalEventHandlerMap = nil;
+
 @implementation DoraemonMCCommandExcutor
 
 + (void)excuteMessageStrFromNet:(NSString *)message {
@@ -17,7 +20,6 @@ + (void)excuteMessageStrFromNet:(NSString *)message {
 }
 
 + (void)excuteMessage:(DoraemonMCMessage *)message {
-    static NSDictionary *eventHandlerMap = nil ;
     static dispatch_once_t onceToken;
     dispatch_once(&onceToken, ^{
         DoraemonMCReuseCellEventHandler *handlerReuseCell =  [DoraemonMCReuseCellEventHandler new];
@@ -29,6 +31,7 @@ + (void)excuteMessage:(DoraemonMCMessage *)message {
             @(DoraemonMCMessageTypeTextInput) : [DoraemonMCTextFiledEventHandler new],
             @(DoraemonMCMessageTypeTarbarSelected) : [DoraemonMCTabbarEventHandler new]
         };
+        externalEventHandlerMap = [NSMutableDictionary new];
     });
 
     [eventHandlerMap enumerateKeysAndObjectsUsingBlock:^(NSNumber * _Nonnull typeNumber, DoraemonMCEventHandler * _Nonnull eventHandler, BOOL * _Nonnull stop) {
@@ -38,6 +41,34 @@ + (void)excuteMessage:(DoraemonMCMessage *)message {
         }
     }];
 
+
+    [externalEventHandlerMap enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull typeString, DoraemonMCEventHandler * _Nonnull eventHandler, BOOL * _Nonnull stop) {
+        if ([message.customType isEqualToString:typeString]) {
+            [eventHandler handleEvent:message];
+            *stop = YES;
+        }
+    }];
+
+
+}
+
+//增加自定义事件
++ (void)addCustomMessage:(NSString *)type eventHandlerName:(DoraemonMCEventHandler *)eventHandler {
+    if (eventHandler && type) {
+
+        [externalEventHandlerMap enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull typeString, DoraemonMCEventHandler * _Nonnull eventHandler, BOOL * _Nonnull stop) {
+            if ([type isEqualToString:typeString]) {
+                *stop = YES;
+                NSAssert(stop, @"重复添加事件");
+            }
+        }];
+
+        [externalEventHandlerMap setValue:eventHandler forKey:type];
+    }
 }
 
+
+
+
+
 @end

iOS/DoraemonKit/Src/MultiControl/Function/Dispatcher/DoraemonMCCommandGenerator.h

@@ -18,6 +18,12 @@
                                   indexPath:(NSIndexPath *)indexPath
                                messageType:(DoraemonMCMessageType)type;
 
++ (DoraemonMCMessage *)sendCustomMessageWithView:(UIView *)view
+                                       eventInfo:(NSDictionary *)eventInfo
+                                     messageType:(NSString *)type;
+
+
+
 @end
 
 

iOS/DoraemonKit/Src/MultiControl/Function/Dispatcher/DoraemonMCCommandGenerator.m

@@ -29,5 +29,18 @@ + (void)sendMessageWithView:(UIView *)view
     }
 
 }
+
+
++ (DoraemonMCMessage *)sendCustomMessageWithView:(UIView *)view
+                                       eventInfo:(NSDictionary *)eventInfo
+                                     messageType:(NSString *)type {
+
+    DoraemonMCMessage *message = [DoraemonMCMessagePackager packageCustomMessageWithView:view
+                                                                               eventInfo:eventInfo
+                                                                             messageType:type];
+
+    [DoraemonMCServer sendMessage:message.toMessageString];
+    return message;
+}
 @end
 

iOS/DoraemonKit/Src/MultiControl/Function/Event/Excutor/DoraemonMCEventHandler.h

@@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)handleEvent:(DoraemonMCMessage*)eventInfo;
 
+- (UIView *)fetchTargetView;
+
 @end
 
 @interface DoraemonMCGestureRecognizerEventHandler : DoraemonMCEventHandler

iOS/DoraemonKit/Src/MultiControl/Function/MessagePackager/DoraemonMCMessagePackager.h

@@ -28,7 +28,8 @@ typedef NS_ENUM(NSInteger , DoraemonMCMessageType) {
 
 // 消息类型
 @property (nonatomic , assign) DoraemonMCMessageType type;
-
+// 自定义消息类型
+@property (nonatomic , assign) NSString * customType;
 // 控件的xPath
 @property (nonatomic , copy  ) NSString *xPath;
 
@@ -54,6 +55,13 @@ typedef NS_ENUM(NSInteger , DoraemonMCMessageType) {
                            indexPath:(NSIndexPath *)indexPath
                         messageType:(DoraemonMCMessageType)type;
 
+/**
+ 自定义事件
+ */
++ (DoraemonMCMessage *)packageCustomMessageWithView:(UIView *)view
+                                          eventInfo:(NSDictionary *)eventInfo
+                                        messageType:(NSString *)type;
+
 /***
  根据从网络上获取的消息字符串, 解析出消息对象
  */

iOS/DoraemonKit/Src/MultiControl/Function/MessagePackager/DoraemonMCMessagePackager.m

@@ -15,7 +15,7 @@
 static NSString const *kEventInfoKey = @"eventInfo";
 static NSString const *kXpathKey = @"xPath";
 static NSString const *kTypeKey = @"type";
-
+static NSString const *kcustomTypeKey =@"customType";
 @implementation DoraemonMCMessagePackager
 
 /**
@@ -100,13 +100,33 @@ + (DoraemonMCMessage *)packageMessageWithView:(UIView *)view
 }
 
 
+/*
+ * 自定义事件
+ */
++ (DoraemonMCMessage *)packageCustomMessageWithView:(UIView *)view
+                                          eventInfo:(NSDictionary *)eventInfo
+                                        messageType:(NSString *)type {
+    DoraemonMCMessage *messageInstance = [[DoraemonMCMessage alloc] init];
+    messageInstance.customType = type;
+    messageInstance.xPath = [DoraemonMCXPathSerializer xPathStringWithView:view];
+    messageInstance.eventInfo = eventInfo;
+    messageInstance.isFirstResponder = view.isFirstResponder;
+    UIViewController *vc = [DoraemonMCXPathSerializer ownerVCWithView:view];
+    if (vc) {
+        messageInstance.currentVCClassName = NSStringFromClass(vc.class) ;
+    }
+
+    return messageInstance;
+
+}
 /***
  根据从网络上获取的消息字符串, 解析出消息对象
  */
 + (DoraemonMCMessage *)parseMessageString:(NSString *)messageString {
     NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:[messageString dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:NULL];
     DoraemonMCMessage *messageInstance = [[DoraemonMCMessage alloc] init];
     messageInstance.type = [dict[kTypeKey] integerValue];
+    messageInstance.customType = dict[kcustomTypeKey];
     messageInstance.xPath = dict[kXpathKey];
     messageInstance.eventInfo = dict[kEventInfoKey];
     messageInstance.currentVCClassName = dict[kVcClsNameKey];
@@ -119,13 +139,23 @@ + (DoraemonMCMessage *)parseMessageString:(NSString *)messageString {
 @implementation DoraemonMCMessage
 
 - (NSString *)toMessageString {
+
     NSDictionary *dict = @{
         kTypeKey : @(self.type),
         kXpathKey : self.xPath?:@"",
         kEventInfoKey : self.eventInfo?:@{},
         kVcClsNameKey: self.currentVCClassName?:@"",
         kIsFirstResponderKey : @(self.isFirstResponder)
     };
+    if (self.customType.length) {
+        dict = @{
+            kcustomTypeKey : self.customType,
+            kXpathKey : self.xPath?:@"",
+            kEventInfoKey : self.eventInfo?:@{},
+            kVcClsNameKey: self.currentVCClassName?:@"",
+            kIsFirstResponderKey : @(self.isFirstResponder)
+        };
+    }
     if ([NSJSONSerialization isValidJSONObject:dict]) {
         return [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:dict options:NSJSONWritingPrettyPrinted error:NULL] encoding:NSUTF8StringEncoding];
     }

iOS/DoraemonKitDemo/DoraemonKitDemo.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		0977CCE0269F394100A6463E /* DoraemonDemoMultiControlViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0977CCDF269F394000A6463E /* DoraemonDemoMultiControlViewController.m */; };
+		097F6DA326D53E5D00841403 /* DoraemonDemoMultiSlideView.m in Sources */ = {isa = PBXBuildFile; fileRef = 097F6DA226D53E5D00841403 /* DoraemonDemoMultiSlideView.m */; };
 		09B042C526A8585500045D2A /* DoraemonDemoMultiConLongPressGesture.m in Sources */ = {isa = PBXBuildFile; fileRef = 09B042C426A8585500045D2A /* DoraemonDemoMultiConLongPressGesture.m */; };
 		09B042C926A860B400045D2A /* DoraemonDemoMultiConPinchGesture.m in Sources */ = {isa = PBXBuildFile; fileRef = 09B042C826A860B400045D2A /* DoraemonDemoMultiConPinchGesture.m */; };
 		09B042CD26A8760E00045D2A /* DoraemonDemoMultiConRotationGesture.m in Sources */ = {isa = PBXBuildFile; fileRef = 09B042CC26A8760E00045D2A /* DoraemonDemoMultiConRotationGesture.m */; };
@@ -57,6 +58,8 @@
 /* Begin PBXFileReference section */
 		0977CCDE269F394000A6463E /* DoraemonDemoMultiControlViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DoraemonDemoMultiControlViewController.h; sourceTree = "<group>"; };
 		0977CCDF269F394000A6463E /* DoraemonDemoMultiControlViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DoraemonDemoMultiControlViewController.m; sourceTree = "<group>"; };
+		097F6DA126D53E5D00841403 /* DoraemonDemoMultiSlideView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DoraemonDemoMultiSlideView.h; sourceTree = "<group>"; };
+		097F6DA226D53E5D00841403 /* DoraemonDemoMultiSlideView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DoraemonDemoMultiSlideView.m; sourceTree = "<group>"; };
 		09B042C326A8585500045D2A /* DoraemonDemoMultiConLongPressGesture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DoraemonDemoMultiConLongPressGesture.h; sourceTree = "<group>"; };
 		09B042C426A8585500045D2A /* DoraemonDemoMultiConLongPressGesture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DoraemonDemoMultiConLongPressGesture.m; sourceTree = "<group>"; };
 		09B042C726A860B400045D2A /* DoraemonDemoMultiConPinchGesture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DoraemonDemoMultiConPinchGesture.h; sourceTree = "<group>"; };
@@ -172,6 +175,8 @@
 				09B042D426A877ED00045D2A /* DoraemonDemoMultiConScreenEdgePanGesture.m */,
 				09B042D726A8781A00045D2A /* DoraemonDemoMultiConTapGesture.h */,
 				09B042D826A8781A00045D2A /* DoraemonDemoMultiConTapGesture.m */,
+				097F6DA126D53E5D00841403 /* DoraemonDemoMultiSlideView.h */,
+				097F6DA226D53E5D00841403 /* DoraemonDemoMultiSlideView.m */,
 			);
 			path = MultiControl;
 			sourceTree = "<group>";
@@ -597,6 +602,7 @@
 				DAE7BFAD20205C20008D49D8 /* NSObject+Runtime.m in Sources */,
 				DABBE3B521D3AA4D0070518E /* DoraemonWKWebViewViewController.m in Sources */,
 				0977CCE0269F394100A6463E /* DoraemonDemoMultiControlViewController.m in Sources */,
+				097F6DA326D53E5D00841403 /* DoraemonDemoMultiSlideView.m in Sources */,
 				DAFE052D21BD4A4D00F97A59 /* DoraemonDemoMockGPSAnnotation.m in Sources */,
 				DAFE052921BD4A4D00F97A59 /* DoraemonDemoCrashViewController.m in Sources */,
 				DA0C6F3A1FDEBE3800F43588 /* TestPlugin.m in Sources */,
@@ -771,14 +777,14 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEBUG_INFORMATION_FORMAT = dwarf;
-				DEVELOPMENT_TEAM = 46A29A7ADN;
+				DEVELOPMENT_TEAM = 7M2BQXS6D5;
 				ENABLE_BITCODE = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DoraemonKitDemo/DoraemonKitDemo-PrefixHeader.pch";
 				INFOPLIST_FILE = DoraemonKitDemo/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.didi.dokit.demo.test.a;
+				PRODUCT_BUNDLE_IDENTIFIER = com.didi.dokit.demo.test.a123;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";