Merge branch 'modified_appium_wda' of ssh://git-qa.gz.netease.com:32200/maki/wda-eov into modified_appium_wda

Author: moonlight824

WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.h

@@ -147,6 +147,21 @@ typedef NS_ENUM(NSUInteger, FBUIInterfaceAppearance) {
                             duration:(NSTimeInterval)duration
                                error:(NSError **)error;
 
+// modified start tag
+- (BOOL)fb_synthTapWithX:(CGFloat)x
+                       y:(CGFloat)y
+                duration:(CGFloat)duration;
+
+- (BOOL)fb_synthSwipe:(CGFloat)fromX
+                   fromY:(CGFloat)fromY
+                   toX:(CGFloat)toX
+                   toY:(CGFloat)toY
+                delay:(CGFloat)delay;
+
+- (BOOL)fb_synthKeyEvent:(id)keyId
+           modifierFlags:(unsigned long long)modifierFlags;
+// end tag
+
 /**
  Allows to set device appearance
 

WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -24,6 +24,10 @@
 #import "FBXCTestDaemonsProxy.h"
 #import "XCUIDevice.h"
 
+#import "XCPointerEventPath.h"
+#import "XCSynthesizedEventRecord.h"
+#import "XCTRunnerDaemonSession.h"
+
 static const NSTimeInterval FBHomeButtonCoolOffTime = 1.;
 static const NSTimeInterval FBScreenLockTimeout = 5.;
 
@@ -363,6 +367,52 @@ - (BOOL)fb_performIOHIDEventWithPage:(unsigned int)page
   return nil == event ? NO : [self performDeviceEvent:event error:error];
 }
 
+// modified start tag
+- (BOOL)fb_synthTapWithX:(CGFloat)x
+  y:(CGFloat) y
+  duration:(CGFloat) duration
+{
+  CGPoint point = CGPointMake(x,y);
+
+  CGFloat TapDuration = duration;
+
+  XCPointerEventPath *pointerEventPath = [[XCPointerEventPath alloc] initForTouchAtPoint:point offset:0];
+  [pointerEventPath liftUpAtOffset:TapDuration];
+
+  XCSynthesizedEventRecord *eventRecord = [[XCSynthesizedEventRecord alloc] initWithName:nil interfaceOrientation:0];
+  [eventRecord addPointerEventPath:pointerEventPath];
+
+  [[self eventSynthesizer] 
+    synthesizeEvent:eventRecord 
+    completion:(id)^(BOOL result, NSError *invokeError) {} ];
+  return YES;
+}
+
+- (BOOL)fb_synthSwipe:(CGFloat)fromX
+  fromY:(CGFloat) fromY
+  toX:(CGFloat) toX
+  toY:(CGFloat) toY
+  delay:(CGFloat) delay
+{
+  CGPoint point1 = CGPointMake(fromX,fromY);
+  CGPoint point2 = CGPointMake(toX,toY);
+
+  CGFloat TapDuration = 0.05;
+
+  XCPointerEventPath *pointerEventPath = [[XCPointerEventPath alloc] initForTouchAtPoint:point1 offset:0];
+  [pointerEventPath moveToPoint:point2 atOffset:delay];
+  [pointerEventPath liftUpAtOffset:delay];
+
+  XCSynthesizedEventRecord *eventRecord = [[XCSynthesizedEventRecord alloc] initWithName:nil interfaceOrientation:0];
+  [eventRecord addPointerEventPath:pointerEventPath];
+
+  [[self eventSynthesizer]
+    synthesizeEvent:eventRecord
+    completion:(id)^(BOOL result, NSError *invokeError) {} ];
+  return YES;
+}
+// end tag
+
 - (BOOL)fb_setAppearance:(FBUIInterfaceAppearance)appearance error:(NSError **)error
 {
   SEL selector = NSSelectorFromString(@"setAppearanceMode:");

WebDriverAgentLib/Commands/FBCustomCommands.m

@@ -30,6 +30,7 @@
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElementQuery.h"
 #import "FBUnattachedAppLauncher.h"
+#import "sys/utsname.h"
 
 @implementation FBCustomCommands
 
@@ -56,7 +57,21 @@ + (NSArray *)routes
     [[FBRoute GET:@"/wda/batteryInfo"] respondWithTarget:self action:@selector(handleGetBatteryInfo:)],
 #endif
     [[FBRoute POST:@"/wda/pressButton"] respondWithTarget:self action:@selector(handlePressButtonCommand:)],
+
+    // modified start tag 
+    [[FBRoute POST:@"/wda/pressButton"].withoutSession respondWithTarget:self action:@selector(handlePressButtonCommand:)],
+    // end tag
+
     [[FBRoute POST:@"/wda/performIoHidEvent"] respondWithTarget:self action:@selector(handlePeformIOHIDEvent:)],
+
+    // modified start tag 
+    [[FBRoute POST:@"/wda/performIoHidEvent"].withoutSession respondWithTarget:self action:@selector(handlePeformIOHIDEvent:)],
+    [[FBRoute POST:@"/wda/tap"] respondWithTarget:self action:@selector(handleDeviceTap:)],
+    [[FBRoute POST:@"/wda/tap"].withoutSession respondWithTarget:self action:@selector(handleDeviceTap:)],
+    [[FBRoute POST:@"/wda/swipe"] respondWithTarget:self action:@selector(handleDeviceSwipe:)],
+    [[FBRoute POST:@"/wda/swipe"].withoutSession respondWithTarget:self action:@selector(handleDeviceSwipe:)],
+    // end tag
+
     [[FBRoute POST:@"/wda/expectNotification"] respondWithTarget:self action:@selector(handleExpectNotification:)],
     [[FBRoute POST:@"/wda/siri/activate"] respondWithTarget:self action:@selector(handleActivateSiri:)],
     [[FBRoute POST:@"/wda/apps/launchUnattached"].withoutSession respondWithTarget:self action:@selector(handleLaunchUnattachedApp:)],
@@ -285,6 +300,34 @@ + (NSDictionary *)processArguments:(XCUIApplication *)app
   return FBResponseWithOK();
 }
 
+// modified start tag
++ (id <FBResponsePayload>)handleDeviceTap:(FBRouteRequest *)request
+{
+  CGFloat x = [request.arguments[@"x"] doubleValue];
+  CGFloat y = [request.arguments[@"y"] doubleValue];
+  CGFloat duration = [request.arguments[@"duration"] doubleValue];
+  [XCUIDevice.sharedDevice
+    fb_synthTapWithX:x
+    y:y duration:duration];
+
+  return FBResponseWithOK();
+}
+
++ (id <FBResponsePayload>)handleDeviceSwipe:(FBRouteRequest *)request
+{
+  CGFloat fromX = [request.arguments[@"fromX"] doubleValue];
+  CGFloat fromY = [request.arguments[@"fromY"] doubleValue];
+  CGFloat toX = [request.arguments[@"toX"] doubleValue];
+  CGFloat toY = [request.arguments[@"toY"] doubleValue];
+  CGFloat delay = [request.arguments[@"delay"] doubleValue];
+  [XCUIDevice.sharedDevice
+    fb_synthSwipe:fromX
+    fromY:fromY toX:toX toY:toY delay:delay];
+
+  return FBResponseWithOK();
+}
+// modified end tag
+
 + (id <FBResponsePayload>)handleLaunchUnattachedApp:(FBRouteRequest *)request
 {
   NSString *bundle = (NSString *)request.arguments[@"bundleId"];