gitea/aio_first_edtion
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.2.0.8(2024/08/20)

Browse Source 
1. [t_change_ui: clibs.py]
   - 从外部拷贝 icon.ico 文件到 templates 目录
   - 在 assets 目录新建 logs 目录，存放日志文件，并增加了相应的逻辑保证正常执行
2. [t_change_ui: aio.py]：增加 App 窗口图标代码
3. [t_change_ui: openapi.py]：将重复输出的网络错误提示，从 textbox 中转移到 debug.log 日志文件中
This commit is contained in:
gitea
2024-08-20 11:13:45 +08:00
parent 03b15751c2
commit edafd91567
8 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
aio/code/commons/clibs.py
View File

@ -1,4 +1,4 @@
from os import scandir
from os import scandir, mkdir
from threading import Thread
from time import sleep
from os.path import exists
@ -17,8 +17,10 @@ setdefaulttimeout(TIMEOUT)
tab_names = {'dp': 'Data Process', 'at': 'Automatic Test', 'da': 'Duration Action', 'op': 'openapi'}
# PREFIX = '' # for pyinstaller packaging
PREFIX = '../assets/' # for source code debug
log_data_hmi = f'{PREFIX}templates/c_msg.log'
log_data_debug = f'{PREFIX}templates/debug.log'
app_icon = f'{PREFIX}templates/icon.ico'
log_path = f'{PREFIX}templates/logs/'
log_data_hmi = f'{PREFIX}templates/logs/c_msg.log'
log_data_debug = f'{PREFIX}templates/logs/debug.log'
heartbeat = f'{PREFIX}templates/heartbeat'
durable_data_current_xlsx = f'{PREFIX}templates/durable/durable_data_current.xlsx'
durable_data_current_max_xlsx = f'{PREFIX}templates/durable/durable_data_current_max.xlsx'
@ -41,6 +43,9 @@ durable_data_current_max = {
'axis6': [0 for _ in range(18)],
}
if not exists(log_path):
mkdir(log_path)
# version：表示版本，该键值为从1开始的整数。该key必选，除此之外，其它key都是可选。
# formatters：日志格式化器，其value值为一个字典，该字典的每个键值对都代表一个Formatter，键值对中，key代表Formatter ID(自定义ID)，value为字典，描述如何配置相应的Formatter实例。默认格式为 ‘%(message)s’
# filters：日志过滤器，其value值为一个字典，该字典的每个键值对都代表一个Filter，键值对中，key代表Filter ID(自定义ID)，value为字典，描述如何配置相应的Filter实例。

9
aio/code/commons/openapi.py
View File

@ -203,7 +203,7 @@ class HmiRequest(object):
self.c_xs.connect((clibs.ip_addr, 6666))
self.c_xs.setblocking(False)
self.w2t("Connection success", 0, 0, 'green', tab_name=self.tab_name)
logger.info("Connection success...")
with open(clibs.heartbeat, "w", encoding='utf-8') as f_hb:
f_hb.write('1')
md = ModbusRequest(self.w2t)
@ -213,7 +213,7 @@ class HmiRequest(object):
md.write_probe(False)
md.write_axis(1)
except Exception as Err:
self.w2t("Connection failed...", 0, 0, 'red', tab_name=self.tab_name)
logger.info("Connection failed...")
with open(clibs.heartbeat, "w", encoding='utf-8') as f_hb:
f_hb.write('0')
@ -255,7 +255,7 @@ class HmiRequest(object):
with open(clibs.heartbeat, "w", encoding='utf-8') as f_hb:
f_hb.write(_flag)
if _flag == '0':
self.w2t(f"{_id} 心跳丢失，连接失败，重新连接中...", 0, 7, 'red', tab_name=self.tab_name)
logger.info(f"{_id} 心跳丢失，连接失败，重新连接中...")
sleep(2)
def msg_storage(self, response, flag=0):
@ -621,7 +621,8 @@ class HmiRequest(object):
self.c.send(self.package(cmd))
sleep(0.5)
except Exception as Err:
self.w2t(f"{cmd}: 请求发送失败...{Err}", 0, 0, 'red', tab_name=self.tab_name)
# self.w2t(f"{cmd}: 请求发送失败...{Err}", 0, 0, 'red', tab_name=self.tab_name)
logger.info(f"{cmd}: 请求发送失败...{Err}")
return req['id']