merge alas

module/device/method/adb.py

@@ -11,11 +11,7 @@ from module.base.decorator import Config
 from module.device.connection import Connection
 from module.device.method.utils import (RETRY_TRIES, retry_sleep, remove_prefix, handle_adb_error,
                                         ImageTruncated, PackageNotInstalled)
-<<<<<<< HEAD
 from module.exception import RequestHumanTakeover, ScriptError, EmulatorNotRunningError
-=======
-from module.exception import RequestHumanTakeover, ScriptError
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 from module.logger import logger
 
 
@@ -61,7 +57,6 @@ def retry(func):
 
                 def init():
                     pass
-<<<<<<< HEAD
             except AdbError as e:
                 logger.exception(e)
                 import sys
@@ -80,8 +75,6 @@ def retry(func):
 
                     def init():
                         pass
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
             # Unknown
             except Exception as e:
                 logger.exception(e)

module/device/method/droidcast.py

@@ -6,11 +6,7 @@ import numpy as np
 import requests
 from adbutils.errors import AdbError
 
-<<<<<<< HEAD
 from module.base.decorator import cached_property, del_cached_property, Config
-=======
-from module.base.decorator import cached_property, del_cached_property
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 from module.base.timer import Timer
 from module.device.method.uiautomator_2 import ProcessInfo, Uiautomator2
 from module.device.method.utils import (
@@ -258,11 +254,7 @@ class DroidCast(Uiautomator2):
                     raise DroidCastVersionIncompatible(
                         'Requesting screenshots from `DroidCast_raw` but server is `DroidCast`')
             # ValueError: cannot reshape array of size 0 into shape (720,1280)
-<<<<<<< HEAD
             raise ImageTruncated(str(e)+'\nIf your emulator resolution not 1280x720, please set emulator resolution to 1280x720')
-=======
-            raise ImageTruncated(str(e))
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 
         # Convert RGB565 to RGB888
         # https://blog.csdn.net/happy08god/article/details/10516871