refactor SDK_VERSION_NEW to SDK_VERSION_ANDROID7

(cherry picked from commit 414305a)
AirtestProject · Dec 26, 2019 · f86e478 · f86e478
1 parent bc3219d
commit f86e478
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/airtest/core/android/adb.py b/airtest/core/android/adb.py
@@ -13,7 +13,7 @@
 from six.moves import reduce
 
 from airtest.core.android.constant import (DEFAULT_ADB_PATH, IP_PATTERN,
-                                           SDK_VERISON_NEW)
+                                           SDK_VERISON_ANDROID7)
 from airtest.core.error import (AdbError, AdbShellError, AirtestError,
                                 DeviceConnectionError)
 from airtest.utils.compat import decode_path
@@ -349,7 +349,7 @@ def shell(self, cmd):
             command output
 
         """
-        if self.sdk_version < SDK_VERISON_NEW:
+        if self.sdk_version < SDK_VERISON_ANDROID7:
             # for sdk_version < 25, adb shell do not raise error
             # https://stackoverflow.com/questions/9379400/adb-error-codes
             cmd = split_cmd(cmd) + [";", "echo", "---$?---"]
@@ -823,7 +823,7 @@ def line_breaker(self):
 
         """
         if not self._line_breaker:
-            if self.sdk_version >= SDK_VERISON_NEW:
+            if self.sdk_version >= SDK_VERISON_ANDROID7:
                 line_breaker = os.linesep
             else:
                 line_breaker = '\r' + os.linesep

diff --git a/airtest/core/android/android.py b/airtest/core/android/android.py
@@ -9,7 +9,7 @@
 from airtest.core.device import Device
 from airtest.core.android.ime import YosemiteIme
 from airtest.core.android.constant import CAP_METHOD, TOUCH_METHOD, IME_METHOD, ORI_METHOD,\
-    SDK_VERISON_NEW, SDK_VERISON_ANDROID10
+    SDK_VERISON_ANDROID7, SDK_VERISON_ANDROID10
 from airtest.core.android.adb import ADB
 from airtest.core.android.minicap import Minicap
 from airtest.core.android.minitouch import Minitouch
@@ -253,7 +253,7 @@ def snapshot(self, filename=None, ensure_orientation=True, quality=10):
                 if w < h:  # 当前是横屏，但是图片是竖的，则旋转，针对sdk<=16的机器
                     screen = aircv.rotate(screen, self.display_info["orientation"] * 90, clockwise=False)
             # adb 截图总是要根据orientation旋转，但是SDK版本大于等于25(Android7.1以后)无需额外旋转
-            elif self.cap_method == CAP_METHOD.ADBCAP and self.sdk_version <= SDK_VERISON_NEW:
+            elif self.cap_method == CAP_METHOD.ADBCAP and self.sdk_version <= SDK_VERISON_ANDROID7:
                 screen = aircv.rotate(screen, self.display_info["orientation"] * 90, clockwise=False)
         if filename:
             aircv.imwrite(filename, screen, quality)

diff --git a/airtest/core/android/constant.py b/airtest/core/android/constant.py
@@ -14,7 +14,7 @@
     "Linux-armv7l": os.path.join(STATICPATH, "adb", "linux_arm", "adb"),
 }
 DEFAULT_ADB_SERVER = ('127.0.0.1', 5037)
-SDK_VERISON_NEW = 24
+SDK_VERISON_ANDROID7 = 24
 # Android 10 SDK version
 SDK_VERISON_ANDROID10 = 29
 DEBUG = True