增加watch事件，统一一些命名和修饰符和版本判断

ZoMinster · ZoMinster · commit 933eaffd678c · 2017-09-05T18:18:56.000+08:00
diff --git a/BeeHive/BHAppDelegate.h b/BeeHive/BHAppDelegate.h
@@ -28,13 +28,13 @@ typedef void (^BHNotificationCompletionHandler)();
 @property (nonatomic, strong) NSError *notificationsError;
 @property (nonatomic, strong) NSData *deviceToken;
 @property (nonatomic, strong) NSDictionary *userInfo;
-@property (nonatomic, weak) BHNotificationResultHandler notificationResultHander;
+@property (nonatomic, copy) BHNotificationResultHandler notificationResultHander;
 @property (nonatomic, strong) UILocalNotification *localNotification;
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
 @property (nonatomic, strong) UNNotification *notification;
 @property (nonatomic, strong) UNNotificationResponse *notificationResponse;
-@property (nonatomic, weak) BHNotificationPresentationOptionsHandler notificationPresentationOptionsHandler;
-@property (nonatomic, weak) BHNotificationCompletionHandler notificationCompletionHandler;
+@property (nonatomic, copy) BHNotificationPresentationOptionsHandler notificationPresentationOptionsHandler;
+@property (nonatomic, copy) BHNotificationCompletionHandler notificationCompletionHandler;
 @property (nonatomic, strong) UNUserNotificationCenter *center;
 #endif
 
@@ -43,33 +43,41 @@ typedef void (^BHNotificationCompletionHandler)();
 @interface BHOpenURLItem : NSObject
 
 @property (nonatomic, strong) NSURL *openURL;
-@property (nonatomic, strong) NSString *sourceApplication;
+@property (nonatomic, copy) NSString *sourceApplication;
 @property (nonatomic, strong) id annotation;
 @property (nonatomic, strong) NSDictionary *options;
 
 @end
 
-typedef void (^shortcutItemCompletionHandler)(BOOL);
+typedef void (^BHShortcutCompletionHandler)(BOOL);
 
 @interface BHShortcutItem : NSObject
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED > 80400
 @property(nonatomic, strong) UIApplicationShortcutItem *shortcutItem;
-@property(nonatomic, copy) shortcutItemCompletionHandler scompletionHandler;
+@property(nonatomic, copy) BHShortcutCompletionHandler scompletionHandler;
 #endif
 
 @end
 
 
-typedef void (^restorationHandler)(NSArray *);
+typedef void (^BHUserActivityRestorationHandler)(NSArray *);
 
 @interface BHUserActivityItem : NSObject
 
-@property (nonatomic, strong) NSString *userActivityType;
+@property (nonatomic, copy) NSString *userActivityType;
 @property (nonatomic, strong) NSUserActivity *userActivity;
 @property (nonatomic, strong) NSError *userActivityError;
-@property (nonatomic, strong) restorationHandler restorationHandler;
+@property (nonatomic, copy) BHUserActivityRestorationHandler restorationHandler;
 
+@end
+
+typedef void (^BHWatchReplyHandler)(NSDictionary *replyInfo);
+
+@interface BHWatchItem : NSObject
+
+@property (nonatomic, strong) NSDictionary *userInfo;
+@property (nonatomic, copy) BHWatchReplyHandler replyHandler;
 
 @end
 
diff --git a/BeeHive/BHAppDelegate.m b/BeeHive/BHAppDelegate.m
@@ -46,7 +46,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 }
 
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED > 80400 
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80400 
 
 -(void)application:(UIApplication *)application performActionForShortcutItem:(UIApplicationShortcutItem *)shortcutItem completionHandler:(void (^)(BOOL))completionHandler
 {
@@ -90,7 +90,7 @@ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceAppl
     return YES;
 }
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED > 80400
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80400
 - (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString *,id> *)options
 {
   
@@ -138,18 +138,18 @@ - (void)application:(UIApplication *)application didReceiveLocalNotification:(UI
     [[BHModuleManager sharedManager] triggerEvent:BHMDidReceiveLocalNotificationEvent];
 }
 
-#if __IPHONE_OS_VERSION_MAX_ALLOWED > 80000
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000
 - (void)application:(UIApplication *)application didUpdateUserActivity:(NSUserActivity *)userActivity
 {
-    if([UIDevice currentDevice].systemVersion.floatValue > 8.0f){
+    if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){
         [[BeeHive shareInstance].context.userActivityItem setUserActivity: userActivity];
         [[BHModuleManager sharedManager] triggerEvent:BHMDidUpdateUserActivityEvent];
     }
 }
 
 - (void)application:(UIApplication *)application didFailToContinueUserActivityWithType:(NSString *)userActivityType error:(NSError *)error
 {
-    if([UIDevice currentDevice].systemVersion.floatValue > 8.0f){
+    if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){
         [[BeeHive shareInstance].context.userActivityItem setUserActivityType: userActivityType];
         [[BeeHive shareInstance].context.userActivityItem setUserActivityError: error];
         [[BHModuleManager sharedManager] triggerEvent:BHMDidFailToContinueUserActivityEvent];
@@ -158,7 +158,7 @@ - (void)application:(UIApplication *)application didFailToContinueUserActivityWi
 
 - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserActivity *)userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler
 {
-    if([UIDevice currentDevice].systemVersion.floatValue > 8.0f){
+    if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){
         [[BeeHive shareInstance].context.userActivityItem setUserActivity: userActivity];
         [[BeeHive shareInstance].context.userActivityItem setRestorationHandler: restorationHandler];
         [[BHModuleManager sharedManager] triggerEvent:BHMContinueUserActivityEvent];
@@ -168,12 +168,19 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct
 
 - (BOOL)application:(UIApplication *)application willContinueUserActivityWithType:(NSString *)userActivityType
 {
-    if([UIDevice currentDevice].systemVersion.floatValue > 8.0f){
+    if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){
         [[BeeHive shareInstance].context.userActivityItem setUserActivityType: userActivityType];
         [[BHModuleManager sharedManager] triggerEvent:BHMWillContinueUserActivityEvent];
     }
     return YES;
 }
+- (void)application:(UIApplication *)application handleWatchKitExtensionRequest:(nullable NSDictionary *)userInfo reply:(void(^)(NSDictionary * __nullable replyInfo))reply {
+    if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){
+        [BeeHive shareInstance].context.watchItem.userInfo = userInfo;
+        [BeeHive shareInstance].context.watchItem.replyHandler = reply;
+        [[BHModuleManager sharedManager] triggerEvent:BHMHandleWatchKitExtensionRequestEvent];
+    }
+}
 #endif
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000
 - (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler {
diff --git a/BeeHive/BHContext.h b/BeeHive/BHContext.h
@@ -55,6 +55,9 @@ typedef enum
 //user Activity Model
 @property (nonatomic, strong) BHUserActivityItem *userActivityItem;
 
+//watch Model
+@property (nonatomic, strong) BHWatchItem *watchItem;
+
 //custom param
 @property (nonatomic, copy) NSDictionary *customParam;
 
diff --git a/BeeHive/BHModuleManager.h b/BeeHive/BHModuleManager.h
@@ -39,6 +39,7 @@ typedef NS_ENUM(NSInteger, BHModuleEventType)
     BHMContinueUserActivityEvent,
     BHMDidFailToContinueUserActivityEvent,
     BHMDidUpdateUserActivityEvent,
+    BHMHandleWatchKitExtensionRequestEvent,
     BHMDidCustomEvent = 1000
     
 };
diff --git a/BeeHive/BHModuleManager.m b/BeeHive/BHModuleManager.m
@@ -41,6 +41,7 @@
 static  NSString *kContinueUserActivitySelector = @"modContinueUserActivity:";
 static  NSString *kDidUpdateContinueUserActivitySelector = @"modDidUpdateContinueUserActivity:";
 static  NSString *kFailToContinueUserActivitySelector = @"modDidFailToContinueUserActivity:";
+static  NSString *kHandleWatchKitExtensionRequestSelector = @"modHandleWatchKitExtensionRequest:";
 static  NSString *kAppCustomSelector = @"modDidCustomEvent:";
 
 
@@ -420,6 +421,7 @@ - (NSMutableArray *)BHModules
                                @(BHMDidUpdateUserActivityEvent):kDidUpdateContinueUserActivitySelector,
                                
                                @(BHMQuickActionEvent):kQuickActionSelector,
+                               @(BHMHandleWatchKitExtensionRequestEvent):kHandleWatchKitExtensionRequestSelector,
                                @(BHMDidCustomEvent):kAppCustomSelector,
                                }.mutableCopy;
     }
diff --git a/BeeHive/BHModuleProtocol.h b/BeeHive/BHModuleProtocol.h
@@ -75,5 +75,7 @@
 
 - (void)modDidUpdateContinueUserActivity:(BHContext *)context;
 
+- (void)modHandleWatchKitExtensionRequest:(BHContext *)context;
+
 - (void)modDidCustomEvent:(BHContext *)context;
 @end

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(`
`46`	`46`	`}`
`47`	`47`
`48`	`48`
`49`		`-#if __IPHONE_OS_VERSION_MAX_ALLOWED > 80400`
	`49`	`+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80400`
`50`	`50`
`51`	`51`	`-(void)application:(UIApplication )application performActionForShortcutItem:(UIApplicationShortcutItem )shortcutItem completionHandler:(void (^)(BOOL))completionHandler`
`52`	`52`	`{`
`@@ -90,7 +90,7 @@ - (BOOL)application:(UIApplication )application openURL:(NSURL )url sourceAppl`
`90`	`90`	`return YES;`
`91`	`91`	`}`
`92`	`92`
`93`		`-#if __IPHONE_OS_VERSION_MAX_ALLOWED > 80400`
	`93`	`+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80400`
`94`	`94`	`- (BOOL)application:(UIApplication )app openURL:(NSURL )url options:(NSDictionary<NSString ,id> )options`
`95`	`95`	`{`
`96`	`96`
`@@ -138,18 +138,18 @@ - (void)application:(UIApplication *)application didReceiveLocalNotification:(UI`
`138`	`138`	`[[BHModuleManager sharedManager] triggerEvent:BHMDidReceiveLocalNotificationEvent];`
`139`	`139`	`}`
`140`	`140`
`141`		`-#if __IPHONE_OS_VERSION_MAX_ALLOWED > 80000`
	`141`	`+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 80000`
`142`	`142`	`- (void)application:(UIApplication )application didUpdateUserActivity:(NSUserActivity )userActivity`
`143`	`143`	`{`
`144`		`- if([UIDevice currentDevice].systemVersion.floatValue > 8.0f){`
	`144`	`+ if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){`
`145`	`145`	`[[BeeHive shareInstance].context.userActivityItem setUserActivity: userActivity];`
`146`	`146`	`[[BHModuleManager sharedManager] triggerEvent:BHMDidUpdateUserActivityEvent];`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`- (void)application:(UIApplication )application didFailToContinueUserActivityWithType:(NSString )userActivityType error:(NSError *)error`
`151`	`151`	`{`
`152`		`- if([UIDevice currentDevice].systemVersion.floatValue > 8.0f){`
	`152`	`+ if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){`
`153`	`153`	`[[BeeHive shareInstance].context.userActivityItem setUserActivityType: userActivityType];`
`154`	`154`	`[[BeeHive shareInstance].context.userActivityItem setUserActivityError: error];`
`155`	`155`	`[[BHModuleManager sharedManager] triggerEvent:BHMDidFailToContinueUserActivityEvent];`
`@@ -158,7 +158,7 @@ - (void)application:(UIApplication *)application didFailToContinueUserActivityWi`
`158`	`158`
`159`	`159`	`- (BOOL)application:(UIApplication )application continueUserActivity:(NSUserActivity )userActivity restorationHandler:(void (^)(NSArray * _Nullable))restorationHandler`
`160`	`160`	`{`
`161`		`- if([UIDevice currentDevice].systemVersion.floatValue > 8.0f){`
	`161`	`+ if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){`
`162`	`162`	`[[BeeHive shareInstance].context.userActivityItem setUserActivity: userActivity];`
`163`	`163`	`[[BeeHive shareInstance].context.userActivityItem setRestorationHandler: restorationHandler];`
`164`	`164`	`[[BHModuleManager sharedManager] triggerEvent:BHMContinueUserActivityEvent];`
`@@ -168,12 +168,19 @@ - (BOOL)application:(UIApplication *)application continueUserActivity:(NSUserAct`
`168`	`168`
`169`	`169`	`- (BOOL)application:(UIApplication )application willContinueUserActivityWithType:(NSString )userActivityType`
`170`	`170`	`{`
`171`		`- if([UIDevice currentDevice].systemVersion.floatValue > 8.0f){`
	`171`	`+ if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){`
`172`	`172`	`[[BeeHive shareInstance].context.userActivityItem setUserActivityType: userActivityType];`
`173`	`173`	`[[BHModuleManager sharedManager] triggerEvent:BHMWillContinueUserActivityEvent];`
`174`	`174`	`}`
`175`	`175`	`return YES;`
`176`	`176`	`}`
	`177`	`+- (void)application:(UIApplication )application handleWatchKitExtensionRequest:(nullable NSDictionary )userInfo reply:(void(^)(NSDictionary * __nullable replyInfo))reply {`
	`178`	`+ if([UIDevice currentDevice].systemVersion.floatValue >= 8.0f){`
	`179`	`+ [BeeHive shareInstance].context.watchItem.userInfo = userInfo;`
	`180`	`+ [BeeHive shareInstance].context.watchItem.replyHandler = reply;`
	`181`	`+ [[BHModuleManager sharedManager] triggerEvent:BHMHandleWatchKitExtensionRequestEvent];`
	`182`	`+ }`
	`183`	`+}`
`177`	`184`	`#endif`
`178`	`185`	`#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 100000`
`179`	`186`	`- (void)userNotificationCenter:(UNUserNotificationCenter )center willPresentNotification:(UNNotification )notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler {`