From 584289f96c899d553b4dc8c81d83aef171994dd2 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 5 Aug 2024 15:40:20 +0800 Subject: [PATCH] xsync_pc --- .vscode/settings.json | 7 ++ CMakeLists.txt | 28 ++++-- CMakeLists.txt.user | 243 ++------------------------------------------------ logo.ico | Bin 0 -> 4286 bytes mainwindow.cpp | 8 +- 5 files changed, 43 insertions(+), 243 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 logo.ico diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..e0e310a --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,7 @@ +{ + "files.associations": { + "*.hpp": "cpp", + "mutex": "cpp", + "xstring": "cpp" + } +} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 553a003..d7d11dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.14) project(xsync VERSION 0.1 LANGUAGES CXX) @@ -12,8 +12,8 @@ set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Charts Concurrent REQUIRED) +find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets SerialPort Charts Concurrent REQUIRED) include_directories(libxsync/include) @@ -29,14 +29,16 @@ set(PROJECT_SOURCES src/xsync_udp_factory_impl.cpp libxsync/src/xsync_v2_sig_type.cpp libxsync/src/xsync_utils.cpp + app.rc ) -add_executable(xsync +add_executable(xsync WIN32 ${PROJECT_SOURCES} ) +target_link_options(xsync PRIVATE -static -static-libgcc -static-libstdc++) -target_link_libraries(xsync PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Charts Qt${QT_VERSION_MAJOR}::Concurrent wsock32) +target_link_libraries(xsync PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Charts Qt${QT_VERSION_MAJOR}::Concurrent wsock32) set_target_properties(xsync PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com @@ -47,3 +49,19 @@ set_target_properties(xsync PROPERTIES if(QT_VERSION_MAJOR EQUAL 6) qt_finalize_executable(xsync) endif() + +# add_executable(xsync +# ${PROJECT_SOURCES} +# ) + +# target_link_libraries(xsync PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Charts Qt${QT_VERSION_MAJOR}::Concurrent wsock32) + +# set_target_properties(xsync PROPERTIES +# MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com +# MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} +# MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} +# ) + +# if(QT_VERSION_MAJOR EQUAL 6) +# qt_finalize_executable(xsync) +# endif() diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index 08a9e0a..71c2db5 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -94,7 +94,7 @@ Desktop Qt 5.12.12 MinGW 64-bit Desktop Qt 5.12.12 MinGW 64-bit qt.qt5.51212.win64_mingw73_kit - 0 + 1 0 0 @@ -106,7 +106,7 @@ -DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} -DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:/workspace/p_lusterinc/xsync_pc/build + D:\workspace\p_lusterinc\build-xsync_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Debug @@ -151,7 +151,7 @@ -DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} -DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} -DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:/workspace/p_lusterinc/build-xsync_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Release + D:\workspace\p_lusterinc\build-xsync_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Release @@ -181,7 +181,7 @@ ProjectExplorer.BuildSteps.Clean 2 - true + false Release @@ -302,243 +302,14 @@ true false true - D:/workspace/p_lusterinc/xsync_pc/build - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop - Desktop Qt 5.12.12 MSVC2017 64bit - Desktop Qt 5.12.12 MSVC2017 64bit - qt.qt5.51212.win64_msvc2017_64_kit - 0 - 0 - 0 - - Debug - -GMinGW Makefiles --DCMAKE_BUILD_TYPE:STRING=Debug --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DCMAKE_SYSROOT:PATH=C:/Qt/Qt5.12.12/Tools/mingw730_64 --DCMAKE_C_COMPILER_TARGET:STRING=x86_64-w64-mingw32 --DCMAKE_CXX_COMPILER_TARGET:STRING=x86_64-w64-mingw32 --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:\workspace\p_lusterinc\build-xsync_pc-Desktop_Qt_5_12_12_MSVC2017_64bit-Debug - - - - all - - true - Build - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - Build - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Debug - CMakeProjectManager.CMakeBuildConfiguration - - - Release - -GMinGW Makefiles --DCMAKE_BUILD_TYPE:STRING=Release --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DCMAKE_SYSROOT:PATH=C:/Qt/Qt5.12.12/Tools/mingw730_64 --DCMAKE_C_COMPILER_TARGET:STRING=x86_64-w64-mingw32 --DCMAKE_CXX_COMPILER_TARGET:STRING=x86_64-w64-mingw32 --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:\workspace\p_lusterinc\build-xsync_pc-Desktop_Qt_5_12_12_MSVC2017_64bit-Release - - - - all - - true - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release - CMakeProjectManager.CMakeBuildConfiguration - - - RelWithDebInfo - -GMinGW Makefiles --DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DCMAKE_SYSROOT:PATH=C:/Qt/Qt5.12.12/Tools/mingw730_64 --DCMAKE_C_COMPILER_TARGET:STRING=x86_64-w64-mingw32 --DCMAKE_CXX_COMPILER_TARGET:STRING=x86_64-w64-mingw32 --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:\workspace\p_lusterinc\build-xsync_pc-Desktop_Qt_5_12_12_MSVC2017_64bit-RelWithDebInfo - - - - all - - true - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Release with Debug Information - CMakeProjectManager.CMakeBuildConfiguration - - - MinSizeRel - -GMinGW Makefiles --DCMAKE_BUILD_TYPE:STRING=MinSizeRel --DCMAKE_PROJECT_INCLUDE_BEFORE:PATH=%{IDE:ResourcePath}/package-manager/auto-setup.cmake --DCMAKE_SYSROOT:PATH=C:/Qt/Qt5.12.12/Tools/mingw730_64 --DCMAKE_C_COMPILER_TARGET:STRING=x86_64-w64-mingw32 --DCMAKE_CXX_COMPILER_TARGET:STRING=x86_64-w64-mingw32 --DQT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable} --DCMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX} --DCMAKE_C_COMPILER:STRING=%{Compiler:Executable:C} --DCMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx} - D:\workspace\p_lusterinc\build-xsync_pc-Desktop_Qt_5_12_12_MSVC2017_64bit-MinSizeRel - - - - all - - true - CMakeProjectManager.MakeStep - - 1 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - - clean - - true - CMakeProjectManager.MakeStep - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - - Minimum Size Release - CMakeProjectManager.CMakeBuildConfiguration - - 4 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - - false - ProjectExplorer.DefaultDeployConfiguration - - 1 - - true - true - true - - 2 - - xsync - CMakeProjectManager.CMakeRunConfiguration.xsync - xsync - false - true - true - false - true + D:/workspace/p_lusterinc/build-xsync_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Release 1 ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.FileVersion diff --git a/logo.ico b/logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..c0b472d4f356ed251c93c9c9339199498933c71c GIT binary patch literal 4286 zcmeH~yHDFd0EdqTS|L?Ygj9%cAeq{PxoR^N2D&iu*RWFN?uDfTTPs)zh)N9+8)alc zV&D&8s8k-#qlEA0#*sM%N6;if$d10`a%bOnFWVU&*=PJZ_0Q7(_A@l0)`dE8YOiXs=Dh^hKSkP6`ySofEsqBAOVhut%J2GB z|178tTs{!D0LSnPclx&9qyC;p+6f%MJh*x2zw&w29)FJi?(r{I;FP;=4}17`;@%~V z|ND+V$KR{|i9cp8OWHpff64oIzx6Mfe{RkH$^09?{yydPM|+Di_zJ5Lz7SrAKd{~J z^}oRW1IEewJ6yzYPTCs&6m<4y(ZEC2KRq+k2=L2R$1spf g&Qi2XbFG#iVp4l1B)7ls{}+2HKPOIK1o=muH%TqlF#rGn literal 0 HcmV?d00001 diff --git a/mainwindow.cpp b/mainwindow.cpp index 53b8f6e..678a844 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -506,8 +506,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi // XsyncIns()->initialize(XSyncUdpFactoryImpl::Ins()); XsyncInit(XSyncUdpFactoryImpl::Ins()); xsync_config_t config = {0}; - config.listenCameraSyncPacket = true; - XsyncIns()->initialize(&config); + config.listenCameraSyncPacket = false; + xs_error_code_t ecode = XsyncIns()->initialize(&config); + if(ecode != kxs_ec_success){ + ZLOGE(TAG, "XsyncIns()->initialize fail,ecode:%d", ecode); + exit(-1); + } XsyncIns()->registerOnConnectStateChangeCallback([this](bool state, string targetIp) { ZLOGI(TAG, "targetIp:%s,state:%d", targetIp.c_str(), state); if (state) {