diff --git a/.gitignore b/.gitignore index f6bde6b..bd88585 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,8 @@ Thumbs.db build CMakeLists.txt.user +*.exe +!makesfx.exe +!release/*.exe + +dist \ No newline at end of file diff --git a/IflytopCom/IflytopCom.exe b/IflytopCom/IflytopCom.exe index e18ebb3..c83f38a 100644 Binary files a/IflytopCom/IflytopCom.exe and b/IflytopCom/IflytopCom.exe differ diff --git a/release/IflytopComV104.exe b/release/IflytopComV104.exe new file mode 100644 index 0000000..6248b5c Binary files /dev/null and b/release/IflytopComV104.exe differ diff --git a/src/app/transmit_disinfection/transmitdisinfection.cpp b/src/app/transmit_disinfection/transmitdisinfection.cpp index a962ced..96cdb88 100644 --- a/src/app/transmit_disinfection/transmitdisinfection.cpp +++ b/src/app/transmit_disinfection/transmitdisinfection.cpp @@ -35,6 +35,11 @@ TransmitDisinfection::TransmitDisinfection(QWidget *parent) : QTabWidget(parent) // Init end CAN_MASTER->initialize(&ChannelMgr::ins()->serialCh); + ChannelMgr::ins()->serialCh.regOnStateChange([this](bool open){ + if(open){ + CAN_MASTER->getCanProtocolCom()->updateChannelConfig(); + } + }); ZQUI::ins()->mainW()->setSerialDefaultBaudrate("2000000"); ErrorCodeInitializer().regErrorcodeInfo(); diff --git a/src/app_version.hpp b/src/app_version.hpp index 6650add..fd4271a 100644 --- a/src/app_version.hpp +++ b/src/app_version.hpp @@ -1,8 +1,8 @@ #pragma once #define VERSION(main, sub, fix) (main << 16 | sub << 8 | fix << 0) -#define APP_VERSION VERSION(1, 0, 3) -#define APP_VERSION_STR "1.0.3" +#define APP_VERSION VERSION(1, 0, 4) +#define APP_VERSION_STR "1.0.4" #define APP_VERSION_MAIN VERSION_MAIN(APP_VERSION) #define APP_VERSION_SUB VERSION_SUB(APP_VERSION) diff --git a/tools/makesfx.exe b/tools/makesfx.exe new file mode 100644 index 0000000..d5d6cb1 Binary files /dev/null and b/tools/makesfx.exe differ diff --git a/tools/packet.bat b/tools/packet.bat new file mode 100644 index 0000000..6e1ecb1 --- /dev/null +++ b/tools/packet.bat @@ -0,0 +1,2 @@ +@REM #打包指令 +.\tools\makesfx.exe -ic -mf -ft -we -di -un -oo .\IflytopCom\ .\dist\IflytopCom.exe .\logo.ico .\IflytopCom\IflytopCom.exe \ No newline at end of file diff --git a/单文件制作_x64.exe b/单文件制作_x64.exe deleted file mode 100644 index 0e66444..0000000 Binary files a/单文件制作_x64.exe and /dev/null differ