|
@@ -161,6 +161,7 @@ class CTMenu(CBaseLog):
|
|
|
targetFocus = False
|
|
targetFocus = False
|
|
|
# 目标文本或数值;
|
|
# 目标文本或数值;
|
|
|
targetText = None
|
|
targetText = None
|
|
|
|
|
+ self.info(u"===========maxTry=%d" % maxTry)
|
|
|
# 移动到目标节点;
|
|
# 移动到目标节点;
|
|
|
while True:
|
|
while True:
|
|
|
# 截图,截图完后马上进入信源;
|
|
# 截图,截图完后马上进入信源;
|
|
@@ -178,7 +179,7 @@ class CTMenu(CBaseLog):
|
|
|
# endif
|
|
# endif
|
|
|
|
|
|
|
|
# 如果是usb信源，特殊处理;
|
|
# 如果是usb信源，特殊处理;
|
|
|
- if 'usb' in targetText.lower():
|
|
|
|
|
|
|
+ if targetText and 'usb' in targetText.lower():
|
|
|
self.__exitUsbSource(opa)
|
|
self.__exitUsbSource(opa)
|
|
|
|
|
|
|
|
# 因为信源界面消失了,需要再调用一次.
|
|
# 因为信源界面消失了,需要再调用一次.
|
|
@@ -519,7 +520,7 @@ class CTMenu(CBaseLog):
|
|
|
def setSourceValue(self, optionName):
|
|
def setSourceValue(self, optionName):
|
|
|
self.info(u"【%s】" % optionName)
|
|
self.info(u"【%s】" % optionName)
|
|
|
CTMenu.sourceInput.setPattern(11)
|
|
CTMenu.sourceInput.setPattern(11)
|
|
|
- sourceList = self.__optionExcel.getOptionAllChildItemName(optionName)
|
|
|
|
|
|
|
+ sourceList = self.__optionExcel.getOptionAllSiblingItemTextList1d(optionName)
|
|
|
opa = COptionAction(optionName, None, self.__optionConfig, self.__optionExcel)
|
|
opa = COptionAction(optionName, None, self.__optionConfig, self.__optionExcel)
|
|
|
|
|
|
|
|
# 检测路径是否有效;
|
|
# 检测路径是否有效;
|
|
@@ -703,4 +704,5 @@ if __name__ == "__main__":
|
|
|
# ml.setSourceValue('hdmi1')
|
|
# ml.setSourceValue('hdmi1')
|
|
|
ml.setSourceValue('hdmi2')
|
|
ml.setSourceValue('hdmi2')
|
|
|
# ml.setSourceValue('dtv')
|
|
# ml.setSourceValue('dtv')
|
|
|
- # ml.setSourceValue('av')
|
|
|
|
|
|
|
+ print u'------------------------------'
|
|
|
|
|
+ ml.setSourceValue('av')
|
