完善checkOptionValue。

ssat_sdk/MenuTree3/logic.py

@@ -8,7 +8,8 @@ from OptionFocus import COptionFocus
 from OptionOCR import COptionOCR
 from OptionAction import COptionAction
 from ssat_sdk.source_input import SourceGenInput
-
+# 测试使用到
+import random
 
 class CMenuLogic(CBaseLog):
     sourceInput = SourceGenInput()
@@ -173,15 +174,26 @@ class CMenuLogic(CBaseLog):
         self.info(u"进入value表")
         opa.enterNode()
 
+        isValueEqual = False
         # 获取value节点值;
         valueFocus, valueText = opa.isOnTargetNode()
         self.info(u"===当前捕获的文本内容=%s，目标文本=%s，状态：%d===" % (str(valueText), str(optionValue), valueFocus))
 
+        # 如果是数值,则判断获取的值是否相等;否则,只判断是否聚焦.
+        if type(optionValue) == int or type(optionValue) == float:
+            isValueEqual = True if float(optionValue) == float(valueText) else False
+        else:
+            isValueEqual = valueFocus
+
+        # 因为只是查看值,没有设置值,所以需要再手动返回一层。
+        opa.back2ParentNode(False)
+
         # 返回主页;
         self.__back2Home(opa)
 
         # 聚焦状态就是结果;
-        return valueFocus
+        self.info(u"checkOptionValue结果：optionValue=%s, ocrValue=%s, 结果=%d" % (str(optionValue), str(valueText), isValueEqual))
+        return isValueEqual
 
 
 if __name__ == "__main__":
@@ -199,22 +211,29 @@ if __name__ == "__main__":
         time.sleep(2)
         ml.setOptionValue('picture_preset', 'movie')
 
-    if 0:
-        value = 33
+    if 1:
+        value = random.randint(0, 100)
         ml.setOptionValue('backlight', value)
-        time.sleep(2)
-        ml.setOptionValue('brightness', value)
-        time.sleep(2)
-        ml.setOptionValue('contrast', value)
-        time.sleep(2)
-        ml.setOptionValue('saturation', value)
-        time.sleep(2)
-        ml.setOptionValue('tint', value)
-        time.sleep(2)
-        ml.setOptionValue('sharpness', value)
+        time.sleep(8)
+        ml.checkOptionValue('backlight', value + 10)
+        time.sleep(8)
+        ml.checkOptionValue('backlight', value)
+        time.sleep(8)
+        ml.checkOptionValue('backlight', value+20)
+
+        # time.sleep(2)
+        # ml.setOptionValue('brightness', value)
+        # time.sleep(2)
+        # ml.setOptionValue('contrast', value)
+        # time.sleep(2)
+        # ml.setOptionValue('saturation', value)
+        # time.sleep(2)
+        # ml.setOptionValue('tint', value)
+        # time.sleep(2)
+        # ml.setOptionValue('sharpness', value)
 
-    if 1:
-        ml.setOptionValue('picture_preset', 'standard')
+    if 0:
+        ml.setOptionValue('picture_preset', 'stadium')
         time.sleep(5)
         print "personal", ml.checkOptionValue('picture_preset', 'personal')
         time.sleep(8)