Culebron: Take screenshot using UiAutomatorHelper if available

dtmilano · dtmilano · commit ce8507ca3ddf · 2015-12-24T12:43:09.000-05:00
- Version 11.0.9
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-    version='11.0.8',
+    version='11.0.9',
     description='''AndroidViewClient is a 100% pure python library and tools
         that simplifies test script creation providing higher level
         operations and the ability of obtaining the tree of Views present at
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -18,7 +18,7 @@
 '''
 import threading
 
-__version__ = '11.0.8'
+__version__ = '11.0.9'
 
 import sys
 import warnings
diff --git a/src/com/dtmilano/android/concertina.py b/src/com/dtmilano/android/concertina.py
@@ -25,7 +25,7 @@
 import time
 
 __author__ = 'diego'
-__version__ = '11.0.8'
+__version__ = '11.0.9'
 
 DEBUG = True
 
diff --git a/src/com/dtmilano/android/controlpanel.py b/src/com/dtmilano/android/controlpanel.py
@@ -19,7 +19,7 @@
     @author: Ahmed Kasem
     '''
 
-__version__ = '11.0.8'
+__version__ = '11.0.9'
 
 import sys, os
 import Tkinter, tkFileDialog, ttk
diff --git a/src/com/dtmilano/android/culebron.py b/src/com/dtmilano/android/culebron.py
@@ -18,14 +18,15 @@
 @author: Diego Torres Milano
 
 '''
+import StringIO
 import random
 import time
 import re
 from com.dtmilano.android.common import profileStart
 from com.dtmilano.android.common import profileEnd
 from com.dtmilano.android.concertina import Concertina
 
-__version__ = '11.0.8'
+__version__ = '11.0.9'
 
 import sys
 import threading
@@ -236,6 +237,9 @@ def __init__(self, vc, device, serialno, printOperation, scale=1, concertina=Fal
         self.isTouchingPoint = self.vc is None
         self.coordinatesUnit = Unit.DIP
         self.permanentlyDisableEvents = False
+        self.unscaledScreenshot = None
+        self.image = None
+        self.screenshot = None
         if DEBUG:
             try:
                 self.printGridInfo()
@@ -272,7 +276,12 @@ def takeScreenshotAndShowItOnWindow(self):
 
         if DEBUG:
             print >> sys.stderr, "takeScreenshotAndShowItOnWindow()"
-        self.unscaledScreenshot = self.device.takeSnapshot(reconnect=True)
+        if self.vc and self.vc.uiAutomatorHelper:
+            received = self.vc.uiAutomatorHelper.takeScreenshot()
+            stream = StringIO.StringIO(received)
+            self.unscaledScreenshot = Image.open(stream)
+        else:
+            self.unscaledScreenshot = self.device.takeSnapshot(reconnect=True)
         self.image = self.unscaledScreenshot
         (width, height) = self.image.size
         if self.scale != 1:
diff --git a/src/com/dtmilano/android/robotframework/viewclientwrapper.py b/src/com/dtmilano/android/robotframework/viewclientwrapper.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '11.0.8'
+__version__ = '11.0.9'
 __author__ = 'diego'
 
 import sys
diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '11.0.8'
+__version__ = '11.0.9'
 
 import os
 import subprocess
diff --git a/tools/culebra b/tools/culebra
@@ -20,7 +20,7 @@ ___________________/  /__/  /__/  /__/  /________________________________
 
 ''' 
 
-__version__ = '11.0.8'
+__version__ = '11.0.9'
 
 import re
 import sys
diff --git a/tools/dump b/tools/dump
@@ -6,7 +6,7 @@ Created on Feb 3, 2012
 @author: diego
 '''
 
-__version__ = '11.0.8'
+__version__ = '11.0.9'
 
 import sys
 import os
