Release 1.1.1

* Fixed problem with multiple devices and how blue temproary rectangle disappeared.

Author: MilleBo

src/Testura.Android.PageObjectCreator/Properties/AssemblyInfo.cs

@@ -39,5 +39,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyFileVersion("1.1.1.0")]

src/Testura.Android.PageObjectCreator/Services/DumpService.cs

@@ -42,7 +42,7 @@ public async Task<AndroidDumpInfo> DumpScreenAsync(string serial)
             {
                 var dump = DumpScreen(serial);
                 var screenshot = TakeScreenshot(serial);
-                var packageAndActivity = GetCurrentFocus().Split('/');
+                var packageAndActivity = GetCurrentFocus(serial).Split('/');
                 return new AndroidDumpInfo
                 {
                     DumpPath = dump,
@@ -111,24 +111,22 @@ private void TraverseElement(XElement element, Node node)
         private string DumpScreen(string serial)
         {
             var savePath = Path.Combine(AssemblyDirectory, "dump.xml");
-            _terminal.ExecuteCmdCommand("adb.exe", "shell", "uiautomator", "dump", "/sdcard/dump.xml");
-            _terminal.ExecuteCmdCommand("adb.exe", "pull", "/sdcard/dump.xml", AssemblyDirectory);
-            _terminal.ExecuteCmdCommand("adb.exe", "shell", "rm", savePath);
+            _terminal.ExecuteCmdCommand("adb.exe", "-s", serial, "shell", "uiautomator", "dump", "/sdcard/dump.xml");
+            _terminal.ExecuteCmdCommand("adb.exe", "-s", serial, "pull", "/sdcard/dump.xml", AssemblyDirectory);
             return savePath;
         }
 
         private string TakeScreenshot(string serial)
         {
             var savePath = Path.Combine(AssemblyDirectory, "screenshot.png");
-            _terminal.ExecuteCmdCommand("adb.exe", "shell", "screencap ", "-p", "/sdcard/screenshot.png");
-            _terminal.ExecuteCmdCommand("adb.exe", "pull", "/sdcard/screenshot.png", AssemblyDirectory);
-            _terminal.ExecuteCmdCommand("adb.exe", "shell", "rm", savePath);
+            _terminal.ExecuteCmdCommand("adb.exe", "-s", serial, "shell", "screencap ", "-p", "/sdcard/screenshot.png");
+            _terminal.ExecuteCmdCommand("adb.exe", "-s", serial, "pull", "/sdcard/screenshot.png", AssemblyDirectory);
             return savePath;
         }
 
-        private string GetCurrentFocus()
+        private string GetCurrentFocus(string serial)
         {
-            var result = _terminal.ExecuteCmdCommand("adb.exe", "shell", "dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp'");
+            var result = _terminal.ExecuteCmdCommand("adb.exe", "-s", serial, "shell", "dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp'");
             var focus = result.Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries).First();
             return focus.Split(' ', '}')[4];
         }

src/Testura.Android.PageObjectCreator/Views/ScreenView.xaml.cs

@@ -92,7 +92,7 @@ private void DeviceCanvas_OnMouseMove(object sender, MouseEventArgs e)
                 return;
             }
 
-            if (_lastSelectedNodeRectangle != null)
+            if (_lastSelectedNodeRectangle != null && _lastSelectedNodeRectangle != _lastTemporaryHierarchyNode)
             {
                 DeviceCanvas.Children.Remove(_lastSelectedNodeRectangle);
             }