1、删除无用import.

2、修复getOptionValueInfo缺少value==None的判断。
3、修复openOption的日志输出BUG。

ssat_sdk/MenuTree3/OptionConfig.py

@@ -1,6 +1,5 @@
 # -*- coding:utf-8 -*-
 import os
-from UIT_PathManage import UITPathManage
 from BaseLog import CBaseLog
 from TConfig import TConfig
 from ExtraData import CExtraData

ssat_sdk/MenuTree3/OptionExcel.py

@@ -1,7 +1,6 @@
 # -*- coding:utf-8 -*-
 import os, json
 from collections import OrderedDict
-from UIT_PathManage import UITPathManage
 from TExcelParser import CExcelParser
 from ssat_sdk.utils.string_util import strToList
 
@@ -526,7 +525,7 @@ class COptionExcel(CBaseLog):
             "others": self.__valueParams.values[optionName]['others']
         }
         # 找到value对应的ocr;
-        if value != "":
+        if value is not None and value != "":
             vp["value"] = value
             for item in self.__valueParams.values[optionName]["value"]:
                 if "range(" in item["value"]:

ssat_sdk/MenuTree3/TMenu.py

@@ -221,7 +221,7 @@ class CTMenu(CBaseLog):
         opa.enterNode()
 
         # 聚焦状态就是结果;
-        self.info(u"成功open指定option" % optionName)
+        self.info(u"成功open指定option=%s" % optionName)
         return True
 
     '''
@@ -265,7 +265,7 @@ class CTMenu(CBaseLog):
 
         # 获取value节点值;
         valueFocus, valueText = opa.isOnTargetNode()
-        self.info(u"===当前捕获的文本内容=%s，状态：%d===" % (str(valueText), valueFocus))
+        self.info(u"===当前捕获的文本内容=%s，聚焦状态：%d===" % (str(valueText), valueFocus))
 
         # 因为只是查看值,没有设置值,所以需要再手动返回一层。
         opa.back2ParentNode(False)
@@ -305,8 +305,38 @@ if __name__ == "__main__":
         time.sleep(st)
         ml.setOptionValue('picture_preset', 'movie')
 
+    if 0:
+        st = 5
+        value = random.randint(0, 100)
+        time.sleep(st)
+        ml.setOptionValue('brightness', value)
+        time.sleep(st)
+        ml.setOptionValue('contrast', value)
+        time.sleep(st)
+        ml.setOptionValue('saturation', value)
+        time.sleep(st)
+        ml.setOptionValue('tint', value)
+        time.sleep(st)
+        ml.setOptionValue('sharpness', value)
+        time.sleep(st)
+        ml.setOptionValue('backlight', value)
+
     if 0:
         st = 2
+        ml.checkOptionValue('picture_preset', 'personal')
+        time.sleep(st)
+        ml.checkOptionValue('picture_preset', 'dynamic')
+        time.sleep(st)
+        ml.checkOptionValue('picture_preset', 'stadium')
+        time.sleep(st)
+        ml.checkOptionValue('picture_preset', 'standard')
+        time.sleep(st)
+        ml.checkOptionValue('picture_preset', 'natural')
+        time.sleep(st)
+        ml.checkOptionValue('picture_preset', 'movie')
+
+    if 0:
+        st = 8
         value = random.randint(0, 100)
         ml.setOptionValue('backlight', value)
         time.sleep(st)
@@ -314,37 +344,78 @@ if __name__ == "__main__":
         time.sleep(st)
         ml.checkOptionValue('backlight', value)
         time.sleep(st)
-        ml.checkOptionValue('backlight', value+20)
 
-        # time.sleep(st)
-        # ml.setOptionValue('brightness', value)
-        # time.sleep(st)
-        # ml.setOptionValue('contrast', value)
-        # time.sleep(st)
-        # ml.setOptionValue('saturation', value)
-        # time.sleep(st)
-        # ml.setOptionValue('tint', value)
-        # time.sleep(st)
-        # ml.setOptionValue('sharpness', value)
+        ml.setOptionValue('brightness', value)
+        time.sleep(st)
+        ml.checkOptionValue('brightness', value + 10)
+        time.sleep(st)
+        ml.checkOptionValue('brightness', value)
+        time.sleep(st)
+
+        ml.setOptionValue('contrast', value)
+        time.sleep(st)
+        ml.checkOptionValue('contrast', value + 10)
+        time.sleep(st)
+        ml.checkOptionValue('contrast', value)
+        time.sleep(st)
+
+        ml.setOptionValue('saturation', value)
+        time.sleep(st)
+        ml.checkOptionValue('saturation', value + 10)
+        time.sleep(st)
+        ml.checkOptionValue('saturation', value)
+        time.sleep(st)
+
+        ml.setOptionValue('tint', value)
+        time.sleep(st)
+        ml.checkOptionValue('tint', value + 10)
+        time.sleep(st)
+        ml.checkOptionValue('tint', value)
+        time.sleep(st)
+
+        ml.setOptionValue('sharpness', value)
+        time.sleep(st)
+        ml.checkOptionValue('sharpness', value + 10)
+        time.sleep(st)
+        ml.checkOptionValue('sharpness', value)
+        time.sleep(st)
 
     if 0:
-        st = 10
-        ml.setOptionValue('picture_preset', 'stadium')
+        st = 30
+        ml.openOption('picture_preset')
         time.sleep(st)
-        print "personal", ml.checkOptionValue('picture_preset', 'personal')
+
+        ml.openOption('brightness')
         time.sleep(st)
-        print "dynamic", ml.checkOptionValue('picture_preset', 'dynamic')
+
+        ml.openOption('contrast')
         time.sleep(st)
-        print "stadium", ml.checkOptionValue('picture_preset', 'stadium')
+
+        ml.openOption('tint')
         time.sleep(st)
-        print "standard", ml.checkOptionValue('picture_preset', 'standard')
+
+        ml.openOption('sharpness')
         time.sleep(st)
-        print "natural", ml.checkOptionValue('picture_preset', 'natural')
+
+        ml.openOption('backlight')
         time.sleep(st)
-        print "movie", ml.checkOptionValue('picture_preset', 'movie')
 
-    if 1:
+    if 0:
         st = 30
+        value = random.randint(0, 100)
+        ml.focusOptionValue('brightness', value)
+        time.sleep(st)
+        ml.focusOptionValue('contrast', value)
+        time.sleep(st)
+        ml.focusOptionValue('saturation', value)
+        time.sleep(st)
+        ml.focusOptionValue('tint', value)
+        time.sleep(st)
+        ml.focusOptionValue('sharpness', value)
+        time.sleep(st)
+        ml.focusOptionValue('backlight', value)
+        time.sleep(st)
+
         ml.focusOptionValue('picture_preset', 'personal')
         time.sleep(st)
         ml.focusOptionValue('picture_preset', 'dynamic')
@@ -356,3 +427,19 @@ if __name__ == "__main__":
         ml.focusOptionValue('picture_preset', 'natural')
         time.sleep(st)
         ml.focusOptionValue('picture_preset', 'movie')
+
+    if 1:
+        st = 2
+        ml.getOptionValue('brightness')
+        time.sleep(st)
+        ml.getOptionValue('contrast')
+        time.sleep(st)
+        ml.getOptionValue('saturation')
+        time.sleep(st)
+        ml.getOptionValue('tint')
+        time.sleep(st)
+        ml.getOptionValue('sharpness')
+        time.sleep(st)
+        ml.getOptionValue('backlight')
+        time.sleep(st)
+        ml.getOptionValue('picture_preset')