Browse Source

去掉__sendAliveKey静态函数,改用内部sendKey函数再次封装sendAliveKey函数。

scbc.sat2 5 years ago
parent
commit
e4cf09e3d7
1 changed files with 18 additions and 11 deletions
  1. 18 11
      ssat_sdk/MenuTree3/OptionAction.py

+ 18 - 11
ssat_sdk/MenuTree3/OptionAction.py

@@ -55,11 +55,6 @@ class COptionAction(CBaseLog):
     # 图片切割对象
     __imgCMP = ImageCMP()
 
-    # 发送鲜活键;
-    @staticmethod
-    def __sendAliveKey(aliveKey):
-        if aliveKey is not None and aliveKey.__len__() > 0:
-            COptionAction.__redRat3.sendKey(aliveKey, 1, 0.1)
 
     def __init__(self, optionName, optionValue, optionConfig, optionExcel):
         CBaseLog.__init__(self)
@@ -500,7 +495,7 @@ class COptionAction(CBaseLog):
             return False, None
 
         # 如果有鲜活键;
-        COptionAction.__sendAliveKey(aliveKey)
+        self.sendAliveKey(aliveKey)
 
         # 获取文本区域框;
         textBox = self.__optionFocus.getFocusTextBox(optionName, focusBox, isValueSheet)
@@ -516,7 +511,7 @@ class COptionAction(CBaseLog):
         # 遍历所有ocr识别选项;
         for ocrConfig in ocrConfigList:
             # 如果有鲜活键;
-            COptionAction.__sendAliveKey(aliveKey)
+            self.sendAliveKey(aliveKey)
             # 识别出当前聚焦文本;
             curFocusText = self.__optionOCR.getImageText(text_pic, ocrConfig, ocrThreshold)
             # 判断识别文本是来正常;
@@ -595,7 +590,7 @@ class COptionAction(CBaseLog):
             return False, None
 
         # 发送鲜活键, 保证界面鲜活;
-        COptionAction.__sendAliveKey(marqueeDict['alive_key'])
+        self.sendAliveKey(marqueeDict['alive_key'])
         # 第二次截图;
         secondRetsult, secondText = self.__getStaticPicText(self.takePicture(), optionName, optionTextList,
                                                             siblingTextList, ocrConfigList,
@@ -605,7 +600,7 @@ class COptionAction(CBaseLog):
             return False, None
 
         # 发送鲜活键, 保证界面鲜活;
-        COptionAction.__sendAliveKey(marqueeDict['alive_key'])
+        self.sendAliveKey(marqueeDict['alive_key'])
         # 比较两文本是否相同;
         if firstText.__len__() and firstText == secondText:
             self.info(u"截图两次,文本(%s)识别相同,聚焦的不是跑马灯Option" % firstText)
@@ -625,7 +620,7 @@ class COptionAction(CBaseLog):
             # 间隔多久截图;
             time.sleep(marqueeDict['sleep_time'])
             # 发送鲜活键;
-            COptionAction.__sendAliveKey(marqueeDict['alive_key'])
+            self.sendAliveKey(marqueeDict['alive_key'])
 
         ocrTextList = []
         # 对截图进行文本识别分析;
@@ -635,7 +630,7 @@ class COptionAction(CBaseLog):
             if result is True:
                 ocrTextList.append(text)
             # 发送鲜活键;
-            COptionAction.__sendAliveKey(marqueeDict['alive_key'])
+            self.sendAliveKey(marqueeDict['alive_key'])
 
         # 过滤重复的字符;
         ocrTextList = self.__removeDuplicateString(ocrTextList)
@@ -769,6 +764,18 @@ class COptionAction(CBaseLog):
         else:
             self.error(u"error:按键内容空")
 
+    '''
+    函数:发送鲜活键;
+    参数:
+        aliveKey     鲜活按键;
+    返回:无
+
+    注意:鲜活键等待时间是0.1秒,因为不考虑截图。
+    '''
+
+    def sendAliveKey(self, aliveKey):
+        self.sendKey(aliveKey, 1, 0.1)
+
 
 if __name__ == "__main__":
     exData = CExtraData()