This commit is contained in:
Wei guangjing 2022-06-11 14:42:04 +08:00
parent 5f44063755
commit 91f490ff45
2 changed files with 5 additions and 13 deletions

View File

@ -19,9 +19,9 @@ def connectOptions(alias):
f = connectConfigFile f = connectConfigFile
else: else:
f = 'tslclient.ini' f = 'tslclient.ini'
config = configparser.ConfigParser() config = configparser.ConfigParser(delimiters=('=',))
config.read(f) config.read(f)
if alias in config: if alias in config.sections():
return config[alias] return config[alias]
return {} return {}
@ -90,7 +90,7 @@ def GetComputeBitsOption():
def GetService(): def GetService():
global defaultConnection global defaultConnection
if defaultConnection: if defaultConnection:
defaultConnection.default_service() return defaultConnection.default_service()
def parse_params(params): def parse_params(params):
@ -100,7 +100,7 @@ def parse_params(params):
if 'Cycle' in params: if 'Cycle' in params:
pp['cycle'] = params['Cycle'] pp['cycle'] = params['Cycle']
if 'CurrentDate' in params: if 'CurrentDate' in params:
pp['time'] = params['CurrentDate'] pp['time'] = pyTSL.DoubleToDatetime(params['CurrentDate'])
if 'bRate' in params: if 'bRate' in params:
pp['rate'] = params['bRate'] pp['rate'] = params['bRate']
if 'RateDay' in params: if 'RateDay' in params:
@ -131,19 +131,11 @@ def RemoteCallFunc(func, args, params):
global defaultConnection global defaultConnection
if defaultConnection: if defaultConnection:
pp = parse_params(params) pp = parse_params(params)
r = defaultConnection.clas(func, *args, **pp) r = defaultConnection.call(func, *args, **pp)
return r.error(), r.value() return r.error(), r.value()
return -1, '连接错误' return -1, '连接错误'
def SetSysParam():
assert 0
def GetSysParam():
assert 0
def EncodeDate(y, m, d): def EncodeDate(y, m, d):
return pyTSL.DatetimeToDouble(datetime.datetime(y, m, d)) return pyTSL.DatetimeToDouble(datetime.datetime(y, m, d))

0
setup.py Normal file
View File