这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WebDriverAgentLib/Utilities/FBXCAXClientProxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
attributes:(NSArray *)attributes
error:(NSError**)error;

- (XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid;
- (nullable XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid;

@end

Expand Down
31 changes: 30 additions & 1 deletion WebDriverAgentLib/Utilities/FBXCAXClientProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,16 @@
#import "FBMacros.h"
#import "XCAXClient_iOS+FBSnapshotReqParams.h"
#import "XCUIDevice.h"
#import "XCUIApplication.h"

static id FBAXClient = nil;

@interface FBXCAXClientProxy ()

@property (nonatomic) NSMutableDictionary<NSNumber *, XCUIApplication *> *appsCache;

@end

@implementation FBXCAXClientProxy

+ (instancetype)sharedClient
Expand All @@ -25,6 +32,7 @@ + (instancetype)sharedClient
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
instance = [[self alloc] init];
instance.appsCache = [NSMutableDictionary dictionary];
FBAXClient = [XCUIDevice.sharedDevice accessibilityInterface];
});
return instance;
Expand Down Expand Up @@ -85,7 +93,28 @@ - (NSDictionary *)attributesForElement:(id<FBXCAccessibilityElement>)element

- (XCUIApplication *)monitoredApplicationWithProcessIdentifier:(int)pid
{
return [[FBAXClient applicationProcessTracker] monitoredApplicationWithProcessIdentifier:pid];
NSMutableSet *terminatedAppIds = [NSMutableSet set];
for (NSNumber *appPid in self.appsCache) {
if (![self.appsCache[appPid] running]) {
[terminatedAppIds addObject:appPid];
}
}
for (NSNumber *appPid in terminatedAppIds) {
[self.appsCache removeObjectForKey:appPid];
}

XCUIApplication *result = [self.appsCache objectForKey:@(pid)];
if (nil != result) {
return result;
}

XCUIApplication *app = [[FBAXClient applicationProcessTracker]
monitoredApplicationWithProcessIdentifier:pid];
if (nil == app) {
return nil;
}
[self.appsCache setObject:app forKey:@(pid)];
return app;
}

@end
Loading