Merge pull request AirtestProject#510 from AirtestProject/dev

yimelia · web-flow · commit 155373ef7dfb · 2021-11-23T17:00:48.000+08:00
1.0.85
diff --git a/poco/drivers/android/lib/pocoservice-debug.apk b/poco/drivers/android/lib/pocoservice-debug.apk
diff --git a/poco/drivers/android/uiautomation.py b/poco/drivers/android/uiautomation.py
@@ -181,11 +181,6 @@ def __init__(self, device=None, using_proxy=True, force_restart=False, use_airte
             p1 = 10081
 
         # start
-        if self._is_running('com.github.uiautomator'):
-            warnings.warn('{} should not run together with "uiautomator". "uiautomator" will be killed.'
-                          .format(self.__class__.__name__))
-            self.adb_client.shell(['am', 'force-stop', 'com.github.uiautomator'])
-
         ready = self._start_instrument(p0, force_restart=force_restart)
         if not ready:
             # 之前启动失败就卸载重装，现在改为尝试kill进程或卸载uiautomator
@@ -250,7 +245,7 @@ def _start_instrument(self, port_to_ping, force_restart=False):
             self._instrument_proc = None
 
         ready = False
-        self.adb_client.shell(['am', 'force-stop', PocoServicePackage])
+        # self.adb_client.shell(['am', 'force-stop', PocoServicePackage])
 
         # 启动instrument之前，先把主类activity启动起来，不然instrumentation可能失败
         self.adb_client.shell('am start -n {}/.TestActivity'.format(PocoServicePackage))
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 six
 requests
 airtest
-hrpc>=1.0.5
+hrpc>=1.0.9
 websocket-client==0.48.0
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@ def parse_requirements(filename='requirements.txt'):
 
 setup(
     name='pocoui',
-    version='1.0.84',
+    version='1.0.85',
     keywords="poco, automation test, ui automation",
     description='Poco cross-engine UI automated test framework.',
     long_description='Poco cross-engine UI automated test framework. 2018 present by NetEase Games',
