|
@@ -20,7 +20,7 @@ from ssat_sdk.sat_environment import getMenuTreeSelectedChannel
|
|
|
|
|
|
# 获取运行函数名;
|
|
|
def get_fun_name():
|
|
|
- return inspect.stack()[1][3]
|
|
|
+ return inspect.stack()[2][3]
|
|
|
|
|
|
|
|
|
# 日志基类;
|
|
@@ -32,49 +32,49 @@ class CBaseLog:
|
|
|
# 时间/内容;
|
|
|
print("%s %s") % (datetime.now().strftime('%Y-%m-%d %H:%M:%S'), msg)
|
|
|
|
|
|
- def debug(self, fun, msg):
|
|
|
+ def debug(self, msg):
|
|
|
# 类型/类名:函数/内容
|
|
|
- log_str = "【DEBUG】<%s::%s> %s" % (self.__class__.__name__, fun, msg)
|
|
|
+ log_str = "【DEBUG】<%s::%s> %s" % (self.__class__.__name__, get_fun_name(), msg)
|
|
|
self.__printlog(log_str)
|
|
|
|
|
|
- def info(self, fun, msg):
|
|
|
+ def info(self, msg):
|
|
|
# 类型/类名:函数/内容
|
|
|
- log_str = "【INFO】<%s::%s> %s" % (self.__class__.__name__, fun, msg)
|
|
|
+ log_str = "【INFO】<%s::%s> %s" % (self.__class__.__name__, get_fun_name(), msg)
|
|
|
self.__printlog(log_str)
|
|
|
|
|
|
- def warn(self, fun, msg):
|
|
|
+ def warn(self, msg):
|
|
|
# 类型/类名:函数/内容
|
|
|
- log_str = "【WARN】<%s::%s> %s" % (self.__class__.__name__, fun, msg)
|
|
|
+ log_str = "【WARN】<%s::%s> %s" % (self.__class__.__name__, get_fun_name(), msg)
|
|
|
self.__printlog(log_str)
|
|
|
|
|
|
- def error(self, fun, msg):
|
|
|
+ def error(self, msg):
|
|
|
# 类型/类名:函数/内容
|
|
|
- log_str = "【ERROR】<%s::%s> %s" % (self.__class__.__name__, fun, msg)
|
|
|
+ log_str = "【ERROR】<%s::%s> %s" % (self.__class__.__name__, get_fun_name(), msg)
|
|
|
self.__printlog(log_str)
|
|
|
|
|
|
def log(self, msg):
|
|
|
# 类型/类名/内容
|
|
|
- log_str = "【LOG】<%s> %s" % (self.__class__.__name__, msg)
|
|
|
+ log_str = "【LOG】<%s::%s> %s" % (self.__class__.__name__, get_fun_name(), msg)
|
|
|
self.__printlog(log_str)
|
|
|
|
|
|
|
|
|
# 外部数据
|
|
|
-class XData(CBaseLog):
|
|
|
+class CXData(CBaseLog):
|
|
|
def __init__(self):
|
|
|
# 配置文件路径;
|
|
|
- self.configPath = ""
|
|
|
+ self.__configPath = ""
|
|
|
# menu tree资源目录(包含了Excel文件路径);
|
|
|
- self.menuTreeDir = ""
|
|
|
+ self.__menuTreeDir = ""
|
|
|
# 默认的excel路径;
|
|
|
- self.defaultExcelPath = ""
|
|
|
+ self.__defaultExcelPath = ""
|
|
|
# tv excel路径;
|
|
|
- self.tvExcelPath = ""
|
|
|
+ self.__tvExcelPath = ""
|
|
|
# enter key excel路径;
|
|
|
- self.enterKeyExcelPath = ""
|
|
|
+ self.__enterKeyExcelPath = ""
|
|
|
# menu tree低下的xls或xlsx文件集;
|
|
|
- self.listAppExcelPath = []
|
|
|
+ self.__listAppExcelPath = []
|
|
|
# 数据状态(只要menuTreeDir和defaultExcelPath有效即为True);
|
|
|
- self.status = False
|
|
|
+ self.__status = False
|
|
|
# 加载数据;
|
|
|
self.loadData()
|
|
|
|
|
@@ -83,7 +83,7 @@ class XData(CBaseLog):
|
|
|
# 1、加载menu tree 路径;
|
|
|
self.menuTreeDir = getMenuTree3SelectedProjectCfgPath()
|
|
|
if not os.path.isdir(self.menuTreeDir):
|
|
|
- self.error(get_fun_name(), "menu tree路径(%s)无效,加载失败!" % tree_path)
|
|
|
+ self.error("menu tree路径(%s)无效,加载失败!" % self.menuTreeDir)
|
|
|
return
|
|
|
# endif
|
|
|
|
|
@@ -91,14 +91,14 @@ class XData(CBaseLog):
|
|
|
# 2、加载配置文件路径;
|
|
|
self.configPath = os.path.join(self.menuTreeDir, "menutree.ini")
|
|
|
if not os.path.exists(self.configPath):
|
|
|
- self.error(get_fun_name(), "配置文件不存在:%s" % self.configPath)
|
|
|
+ self.error("配置文件不存在:%s" % self.configPath)
|
|
|
else:
|
|
|
self.log("配置文件存在:%s" % self.configPath)
|
|
|
|
|
|
# 3、加载默认excel文件路径;
|
|
|
self.defaultExcelPath = os.path.join(self.menuTreeDir, "menutree.xls")
|
|
|
if not os.path.exists(self.defaultExcelPath):
|
|
|
- self.info(get_fun_name(), "默认menu tree excel文件不存在:%s" % self.defaultExcelPath)
|
|
|
+ self.info("默认menu tree excel文件不存在:%s" % self.defaultExcelPath)
|
|
|
self.defaultExcelPath = os.path.join(self.menuTreeDir, "menutree.xlsx")
|
|
|
|
|
|
# 二次判断是否存在;
|
|
@@ -112,7 +112,7 @@ class XData(CBaseLog):
|
|
|
channel = getMenuTreeSelectedChannel()
|
|
|
if not channel or str(channel) == "":
|
|
|
self.tvExcelPath = self.defaultExcelPath
|
|
|
- self.warn(get_fun_name(), "tv表格不存在,使用默认excel=%s" % self.tvExcelPath)
|
|
|
+ self.warn("tv表格不存在,使用默认excel=%s" % self.tvExcelPath)
|
|
|
else:
|
|
|
self.tvExcelPath = os.path.join(self.menuTreeDir, "menuTree_" + channel + ".xls")
|
|
|
if not os.path.exists(self.tvExcelPath):
|
|
@@ -127,14 +127,14 @@ class XData(CBaseLog):
|
|
|
# 5、加载默认excel文件路径;
|
|
|
self.enterKeyExcelPath = os.path.join(self.menuTreeDir, "eventkey_code.xls")
|
|
|
if not os.path.exists(self.enterKeyExcelPath):
|
|
|
- self.info(get_fun_name(), "eventkey_code文件不存在:%s" % self.enterKeyExcelPath)
|
|
|
+ self.info("eventkey_code文件不存在:%s" % self.enterKeyExcelPath)
|
|
|
self.enterKeyExcelPath = os.path.join(self.menuTreeDir, "eventkey_code.xlsx")
|
|
|
|
|
|
# 二次判断是否存在;
|
|
|
if os.path.exists(self.enterKeyExcelPath):
|
|
|
self.log("eventkey_code文件存在:%s" % self.enterKeyExcelPath)
|
|
|
else:
|
|
|
- self.error(get_fun_name(), "eventkey_code文件不存在:%s" % self.enterKeyExcelPath)
|
|
|
+ self.error( "eventkey_code文件不存在:%s" % self.enterKeyExcelPath)
|
|
|
|
|
|
# 6、加载UITree开头的所有xls或xlsx
|
|
|
fileList = os.listdir(self.menuTreeDir)
|
|
@@ -146,6 +146,73 @@ class XData(CBaseLog):
|
|
|
filePath.lower().endswith(".xls") or filePath.lower().endswith(".xlsx")):
|
|
|
self.listAppExcelPath.append(os.path.join(self.menuTreeDir, filePath))
|
|
|
|
|
|
+ @property
|
|
|
+ def configPath(self):
|
|
|
+ return self.__configPath
|
|
|
+
|
|
|
+ @property
|
|
|
+ def menuTreeDir(self):
|
|
|
+ return self.__menuTreeDir
|
|
|
+
|
|
|
+ @property
|
|
|
+ def defaultExcelPath(self):
|
|
|
+ return self.__defaultExcelPath
|
|
|
+
|
|
|
+ @property
|
|
|
+ def tvExcelPath(self):
|
|
|
+ return self.__tvExcelPath
|
|
|
+
|
|
|
+ @property
|
|
|
+ def enterKeyExcelPath(self):
|
|
|
+ return self.__enterKeyExcelPath
|
|
|
+
|
|
|
+ @property
|
|
|
+ def listAppExcelPath(self):
|
|
|
+ return self.__listAppExcelPath
|
|
|
+
|
|
|
+ @property
|
|
|
+ def status(self):
|
|
|
+ return self.__status
|
|
|
+
|
|
|
+
|
|
|
+# 内部数据;
|
|
|
+class CMetaData(CBaseLog):
|
|
|
+ def __init__(self, xdata):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def loadConfig(self):
|
|
|
+ xdata.ConfigPath
|
|
|
+
|
|
|
+ def LoadExcel(self):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def getOptionConfig(self, pos):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def getOptionValue(self, pos):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def getOptionName(self, pos):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def getOptionOthers(self, pos):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def getOptionEnterKey(self, pos):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def getOptionMoveKey(self, pos):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def getOptionShortCutKey(self, pos):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def getOptionBackKey(self, pos):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def getOptionLayout(self, pos):
|
|
|
+ pass
|
|
|
+
|
|
|
|
|
|
# Option数据逻辑类;
|
|
|
class COptionDataLogic(CBaseLog):
|
|
@@ -253,6 +320,14 @@ class COptionActionLogic(CBaseLog):
|
|
|
pass
|
|
|
|
|
|
|
|
|
+class CTest(CBaseLog):
|
|
|
+ def __init__(self):
|
|
|
+ pass
|
|
|
+
|
|
|
+ def Log(self):
|
|
|
+ self.info("fff", "cccc")
|
|
|
+
|
|
|
+
|
|
|
if __name__ == "__main__":
|
|
|
- xdata = XData()
|
|
|
- optdatalogic = COptionDataLogic(None)
|
|
|
+ xdata = CXData()
|
|
|
+ #optdatalogic = COptionDataLogic(None)
|