Skip to content

Commit 8e12faf

Browse files
KangLinKangLin
committed
Add CStats
1 parent ba81b6a commit 8e12faf

File tree

14 files changed

+804
-373
lines changed

14 files changed

+804
-373
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ jobs:
164164
echo "|Windows xp SP3| |[EXE](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_windows_xp_x86_Setup.exe)||||" >> ${{github.workspace}}/Release.md
165165
echo "|Android|[APK](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_android_x86_64_qt6.9.2_Release.apk) | |[APK](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_android_arm64_v8a_qt6.9.2_Release.apk)| |Experiment|" >> ${{github.workspace}}/Release.md
166166
echo "|Macos|[App zip](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_macos-15-intel.zip) [dmg](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_macos-15-intel.dmg)||[App zip](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_macos-14.zip) [dmg](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_macos-14.dmg)||Experiment|" >> ${{github.workspace}}/Release.md
167-
echo "|Linux|[AppImage](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_Linux_x86_64.AppImage)| |[AppImage](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_Linux_aarch64.AppImage)| |unzip zip file. than run `install.sh` install desktop shotcuts, or run SerialPortAssistant_*.AppImage |" >> ${{github.workspace}}/Release.md
167+
echo "|Linux|[AppImage](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_Linux_x86_64.AppImage)| |[AppImage](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_v${{env.SerialPortAssistant_VERSION}}_Linux_aarch64.AppImage)| |chmod u+x SerialPortAssistant_*.AppImage; Run SerialPortAssistant_*.AppImage |" >> ${{github.workspace}}/Release.md
168168
echo "|Ubuntu 24.04|[DEB](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_ubuntu-24.04_amd64.deb)| |[DEB](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_ubuntu-24.04_arm64.deb)| |sudo apt install \"deb file\" |" >> ${{github.workspace}}/Release.md
169169
echo "|Ubuntu 22.04|| |[DEB](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_ubuntu-22.04_arm64.deb)| |sudo apt install \"deb file\" |" >> ${{github.workspace}}/Release.md
170170
echo "|Fedora 42|[RPM](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant-${{env.SerialPortAssistant_VERSION}}-1.fc42.x86_64.rpm)| |[RPM](https://github.com/KangLin/SerialPortAssistant/releases/download/${BRANCH_NAME}/SerialPortAssistant-${{env.SerialPortAssistant_VERSION}}-1.fc42.aarch64.rpm)| |sudo dnf install \"rpm file\" |" >> ${{github.workspace}}/Release.md
@@ -192,6 +192,7 @@ jobs:
192192
- name: Upload To Github Release
193193
if: ${{ startsWith(github.ref, 'refs/tags/') }}
194194
run: |
195+
gh release edit ${{ github.ref_name }} --notes-file ${{github.workspace}}/Release.md
195196
gh release upload ${{ github.ref_name }} ${{github.workspace}}/${{env.artifact_path}}/* ${{github.workspace}}/Release.md ${{github.workspace}}/CheckSum.md ${{ github.workspace }}/update.json
196197
197198
- name: Upload test tag To Github Release

‎.gitignore‎

Lines changed: 145 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,145 @@
1-
debian/files
2-
.flatpak-builder/
3-
*.AppImage
4-
*.snap
5-
*.substvars
6-
debian/.debhelper/
7-
debian/debhelper-build-stamp
8-
debian/serialportassistant/
9-
debian/patches/
10-
.pc/
11-
CMakeLists.txt.user*
12-
.qmake.stash
13-
Translations.qrc
14-
Plugin/PluginStatic.cpp
15-
Plugin/PluginStatic.pri
16-
Plugin/build-Lbs*/
17-
Makefile.Debug
18-
Makefile.Release
19-
Version.h
20-
Update/Update_*.xml
21-
*.log
22-
*.bak
23-
*~
24-
*.autosave
25-
*.qm
26-
*.user
27-
test.xml
28-
.CCodec.h.kate-swp
29-
.kdev4/
30-
.kdev_include_paths
31-
build*/
32-
RabbitIm/
33-
*.ncb
34-
.metadata/
35-
*~
36-
debug/
37-
bin/
38-
*.class
39-
.deps/
40-
Makefile.in
41-
aclocal.m4
42-
config.guess
43-
config.h
44-
config.h.in
45-
config.h.in~
46-
config.log
47-
config.status
48-
config.sub
49-
configure
50-
depcomp
51-
install-sh
52-
libtool
53-
ltmain.sh
54-
missing
55-
reachmonitor
56-
stamp-h1
57-
.deps/
58-
Makefile.in
59-
aclocal.m4
60-
config.guess
61-
config.h
62-
config.h.in
63-
config.h.in~
64-
config.log
65-
config.status
66-
config.sub
67-
configure
68-
depcomp
69-
install-sh
70-
libtool
71-
ltmain.sh
72-
missing
73-
stamp-h1
74-
*.bak
75-
*.bs
76-
*.la
77-
*.lo
78-
*.ft
79-
*.ft.1
80-
*.made
81-
*.o
82-
*.obj
83-
*.old
84-
*.orig
85-
*.out
86-
*.pdb
87-
*.rej
88-
.libs/
89-
Makefile
90-
*.cdf
91-
*.cache
92-
*.obj
93-
*.ilk
94-
*.resources
95-
*.tlb
96-
*.tli
97-
*.tlh
98-
*.tmp
99-
*.rsp
100-
*.pgc
101-
*.pgd
102-
*.meta
103-
*.tlog
104-
*.manifest
105-
*.res
106-
*.pch
107-
*.exp
108-
*.idb
109-
*.rep
110-
*.xdc
111-
*.pdb
112-
*_manifest.rc
113-
*.bsc
114-
*.sbr
115-
*.opensdf
116-
*.sdf
117-
*.suo
118-
Debug/
119-
release/
120-
Release/
121-
ipch/
122-
IncludeLocalDatabase.txt
123-
ThirdLibrary/unix_mingw/
124-
ThirdLibrary/unix/
125-
ThirdLibrary/unix_static/
126-
ThirdLibrary/android/
127-
ThirdLibrary/android_static/
128-
ThirdLibrary/windows_msvc/
129-
ThirdLibrary/windows_mingw/
130-
ThirdLibrary/src/
131-
ThirdLibrary/windows_mingw_static/
132-
ThirdLibrary/windows_msvc_static/
133-
rabbitim.kdev4
134-
*.pro.user.*
135-
Doxygen/
136-
Doxyfile
1+
*.deb
2+
*.exe
3+
*.apk
4+
*.AppImage
5+
update*.xml
6+
update*.json
7+
debian/files
8+
debian/rabbitremotecontrol
9+
debian/.debhelper/
10+
*.snap
11+
.flatpak-builder/
12+
13+
# C++ objects and libs
14+
*.slo
15+
*.lo
16+
*.o
17+
*.a
18+
*.la
19+
*.lai
20+
*.so
21+
*.so.*
22+
*.dll
23+
*.dylib
24+
*.json
25+
*.tmp
26+
*.bkp
27+
28+
*.log
29+
*.substvars
30+
31+
# Qt-es
32+
object_script.*.Release
33+
object_script.*.Debug
34+
*_plugin_import.cpp
35+
/.qmake.cache
36+
/.qmake.stash
37+
*.pro.user
38+
*.pro.user.*
39+
*.qbs.user
40+
*.qbs.user.*
41+
*.moc
42+
moc_*.cpp
43+
moc_*.h
44+
qrc_*.cpp
45+
ui_*.h
46+
*.qmlc
47+
*.jsc
48+
Makefile*
49+
*build-*/
50+
*build_*/
51+
*.qm
52+
*.prl
53+
54+
# Qt unit tests
55+
target_wrapper.*
56+
57+
# QtCreator
58+
*.autosave
59+
.qtcreator/
60+
61+
# QtCreator Qml
62+
*.qmlproject.user
63+
*.qmlproject.user.*
64+
65+
# QtCreator CMake
66+
CMakeLists.txt.user*
67+
CMakeCache.txt
68+
CMakeFiles/
69+
70+
# QtCreator 4.8< compilation database
71+
compile_commands.json
72+
73+
# QtCreator local machine specific files for imported projects
74+
*creator.user*
75+
76+
# Compiled Object files
77+
*.slo
78+
*.lo
79+
*.o
80+
*.obj
81+
82+
# Precompiled Headers
83+
*.gch
84+
*.pch
85+
86+
# Compiled Dynamic libraries
87+
*.so
88+
*.dylib
89+
*.dll
90+
91+
# Fortran module files
92+
*.mod
93+
94+
# Compiled Static libraries
95+
*.lai
96+
*.la
97+
*.a
98+
*.lib
99+
100+
# Executables
101+
*.exe
102+
*.out
103+
*.app
104+
105+
# Platform Specifics - auto generated files
106+
PlatformSpecifics/Windows/*.rc
107+
108+
# Visual studio - project files
109+
*.sln
110+
*.suo
111+
*.vcxproj
112+
*.vcxproj.filters
113+
*.vcxproj.user
114+
115+
# Visual Studio - Build Results
116+
[Dd]ebug/
117+
[Rr]elease/
118+
[Mm]in[Ss]ize[Rr]el/
119+
[Rr]el[Ww]ith[Dd]eb[Ii]nfo/
120+
build*/
121+
122+
# Visual Studio - Browsing Database File
123+
*.sdf
124+
*.opensdf
125+
126+
#osx xcode
127+
DerivedData/
128+
*.DS_Store
129+
*.build
130+
*.xcodeproj
131+
132+
#CPACK related files
133+
CPackConfig-*.cmake
134+
_CPack_Packages/
135+
136+
#packages
137+
*.tar.gz
138+
*.zip
139+
140+
*.swp
141+
*.*~
142+
143+
build_doxygen
144+
145+
notes.sqlite

‎App/CMakeLists.txt‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,21 @@
22

33
project(SerialPortAssistant)
44

5+
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
6+
# 32 位系统
7+
#add_definitions(QT_NO_64BIT_ATOMICS)
8+
set(SerialPortAssistant_DEFINED QT_NO_64BIT_ATOMICS)
9+
message(STATUS "Building for 32-bit, disabling 64-bit atomics")
10+
else()
11+
message(STATUS "Building for 64-bit")
12+
endif()
13+
514
set(HEADER_FILES
615
MainWindow.h
716
Global/Global.h
817
Common/Tool.h
918
SendFile.h
19+
Stats.h
1020
${CMAKE_SOURCE_DIR}/3th_lib/Control/lightbutton.h
1121
)
1222
set(SOURCE_FILES
@@ -15,6 +25,7 @@ set(SOURCE_FILES
1525
Global/Global.cpp
1626
Common/Tool.cpp
1727
SendFile.cpp
28+
Stats.cpp
1829
${CMAKE_SOURCE_DIR}/3th_lib/Control/lightbutton.cpp
1930
)
2031
set(SOURCE_UI_FILES
@@ -63,7 +74,7 @@ ADD_TARGET(NAME ${PROJECT_NAME}
6374
PRIVATE_LIBS RabbitCommon ${QT_LIBRARIES}
6475
PRIVATE_DEFINITIONS SerialPortAssistant_VERSION="${SerialPortAssistant_VERSION}"
6576
SerialPortAssistant_Revision="${SerialPortAssistant_Revision}"
66-
RABBITCOMMON
77+
RABBITCOMMON ${SerialPortAssistant_DEFINED}
6778
VERSION ${SerialPortAssistant_VERSION}
6879
)
6980

‎App/Global/Global.cpp‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,19 @@ CGlobal::CGlobal(QObject *parent) :
2626
{
2727
QSettings conf(RabbitCommon::CDir::Instance()->GetFileUserConfigure(),
2828
QSettings::IniFormat);
29-
m_StatusbarVisible = conf.value("UI/Visible/Statusbar", "true").toBool();
30-
m_ToolbarVisible = conf.value("UI/Visible/Toolbar", "true").toBool();
31-
m_bSendLoop = conf.value("Settings/Send/Loop", "false").toBool();
29+
m_StatusbarVisible = conf.value("UI/Visible/Statusbar", true).toBool();
30+
m_ToolbarVisible = conf.value("UI/Visible/Toolbar", true).toBool();
31+
m_bSendLoop = conf.value("Settings/Send/Loop", false).toBool();
3232
m_nSendLoopTime = conf.value("Settings/Send/LoopTime", 1000).toInt();
3333
m_SendRN = (CGlobal::SEND_R_N)conf.value("Settings/Send/SendRN", 0).toInt();
34-
m_bReceiveDisplayTime = conf.value("Settings/Receive/DisplayTime", "false").toBool();
35-
m_bReceiveDisplaySend = conf.value("Settings/Receive/DisplaySend", "false").toBool();
36-
m_bSaveFile = conf.value("Settings/Receive/SaveFile", "false").toBool();
34+
m_bReceiveDisplayTime = conf.value("Settings/Receive/DisplayTime", false).toBool();
35+
m_bReceiveDisplaySend = conf.value("Settings/Receive/DisplaySend", false).toBool();
36+
bool rate = true;
37+
#if Q_OS_ANDROID
38+
rate = false;
39+
#endif
40+
m_bDisplayRate = conf.value("Settings/Receive/DisplayRate", rate).toBool();
41+
m_bSaveFile = conf.value("Settings/Receive/SaveFile", false).toBool();
3742
m_ReceiveDisplayCode = (ENCODE)conf.value("Settings/Receive/DisplayReceiveCode", 0).toInt();
3843
m_SendDisplayCode = (ENCODE)conf.value("Settings/Receive/DisplaySendCode", 0).toInt();
3944
}
@@ -148,6 +153,20 @@ int CGlobal::SetReceiveDisplaySend(bool bDisplay)
148153
return 0;
149154
}
150155

156+
bool CGlobal::GetDisplayRate()
157+
{
158+
return m_bDisplayRate;
159+
}
160+
161+
int CGlobal::SetDisplayRate(bool bDisplay)
162+
{
163+
m_bDisplayRate = bDisplay;
164+
QSettings conf(RabbitCommon::CDir::Instance()->GetFileUserConfigure(),
165+
QSettings::IniFormat);
166+
conf.setValue("Settings/Receive/DisplayRate", m_bDisplayRate);
167+
return 0;
168+
}
169+
151170
bool CGlobal::GetSaveFile()
152171
{
153172
return m_bSaveFile;

‎App/Global/Global.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@ class CGlobal : public QObject
111111
private:
112112
bool m_bReceiveDisplaySend;
113113

114+
public:
115+
bool GetDisplayRate();
116+
int SetDisplayRate(bool bDisplay);
117+
private:
118+
bool m_bDisplayRate;
119+
114120
public:
115121
enum ENCODE{
116122
ASCII = 0,

0 commit comments

Comments
 (0)