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

Author: NoneTypeCoder

WebDriverAgent.xcodeproj/project.pbxproj

@@ -4229,6 +4229,7 @@
 			buildSettings = {
 				CLANG_STATIC_ANALYZER_MODE = deep;
 				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = CGWUCLNJM7;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = WebDriverAgentRunner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -4276,6 +4277,7 @@
 			baseConfigurationReference = EEE5CABF1C80361500CBBDD9 /* IOSSettings.xcconfig */;
 			buildSettings = {
 				CLANG_STATIC_ANALYZER_MODE = deep;
+				DEVELOPMENT_TEAM = CGWUCLNJM7;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = WebDriverAgentRunner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.h

@@ -74,6 +74,11 @@ typedef NS_ENUM(NSUInteger, FBUIInterfaceAppearance) {
  */
 - (nullable NSString *)fb_wifiIPAddress;
 
+/**
+ Returns device current actural wifi ip4 address
+ */
+- (nullable NSString *)fb_acturalWifiIPAddress;
+
 /**
  Opens the particular url scheme using the default application assigned to it.
  This API only works since XCode 14.3/iOS 16.4

WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -153,6 +153,38 @@ - (NSString *)fb_wifiIPAddress
   return address;
 }
 
+- (NSString *)fb_acturalWifiIPAddress
+{
+  struct ifaddrs *interfaces = NULL;
+  struct ifaddrs *temp_addr = NULL;
+  int success = getifaddrs(&interfaces);
+  if (success != 0) {
+    freeifaddrs(interfaces);
+    return nil;
+  }
+
+  NSString *address = nil;
+  temp_addr = interfaces;
+  bool has_wifi = FALSE;
+  while(temp_addr != NULL) {
+    if(temp_addr->ifa_addr->sa_family != AF_INET) {
+      temp_addr = temp_addr->ifa_next;
+      continue;
+    }
+    NSString *interfaceName = [NSString stringWithUTF8String:temp_addr->ifa_name];
+    address = [NSString stringWithUTF8String:inet_ntoa(((struct sockaddr_in *)temp_addr->ifa_addr)->sin_addr)];
+//    [FBLogger logFmt:@"interface: %@, address: %@", interfaceName, address];
+    
+    if([interfaceName containsString:@"en"] && ![address containsString:@"169.254"]) {
+      has_wifi = TRUE;
+      break;
+    }
+    temp_addr = temp_addr->ifa_next;
+  }
+  freeifaddrs(interfaces);
+  return has_wifi ? address : nil;
+}
+
 - (BOOL)fb_openUrl:(NSString *)url error:(NSError **)error
 {
   NSURL *parsedUrl = [NSURL URLWithString:url];

WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -255,7 +255,8 @@ + (NSArray *)routes
 #if TARGET_OS_SIMULATOR
           @"simulatorVersion" : [[UIDevice currentDevice] systemVersion],
 #endif
-          @"ip" : [XCUIDevice sharedDevice].fb_wifiIPAddress ?: [NSNull null]
+          @"ip" : [XCUIDevice sharedDevice].fb_wifiIPAddress ?: [NSNull null],
+          @"wifiIP" : [XCUIDevice sharedDevice].fb_acturalWifiIPAddress ?: [NSNull null],
         },
       @"build" : buildInfo.copy,
       @"Version":@("1.1"),