From 7dc641f761c88fc771d3ab7d6b014a535ee64875 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 26 Mar 2024 14:32:51 +0800
Subject: [PATCH] update

---
 CMakeLists.txt      |  2 +-
 CMakeLists.txt.user |  3 +--
 libxsync            |  2 +-
 mainwindow.cpp      | 16 +++++++++++++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 729329f..553a003 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ 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 console REQUIRED)
+find_package(QT NAMES Qt6 Qt5 COMPONENTS Widgets REQUIRED)
 find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Charts Concurrent REQUIRED)
 
 include_directories(libxsync/include)
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
index b1dc064..1caef22 100644
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 5.0.2, 2024-03-06T14:20:04. -->
+<!-- Written by QtCreator 5.0.2, 2024-03-07T14:22:32. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -532,7 +532,6 @@
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/workspace/p_lusterinc/build-xsync_pc-Desktop_Qt_5_12_12_MSVC2017_64bit-Debug</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
diff --git a/libxsync b/libxsync
index 8f83a2b..8d56630 160000
--- a/libxsync
+++ b/libxsync
@@ -1 +1 @@
-Subproject commit 8f83a2bf5e1f987871e4342f032ae8c080aa4f07
+Subproject commit 8d566302ea775dfe97f7f86b136cfbbe2888041f
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1c44873..b5d4b36 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -472,7 +472,17 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
   // m_xsync.reset(new Xsync());
 
   // XsyncIns()->initialize(XSyncUdpFactoryImpl::Ins());
-  XsyncInit(XSyncUdpFactoryImpl::Ins(), "192.168.8.10");
+  XsyncInit(XSyncUdpFactoryImpl::Ins());
+  xsync_config_t config = {0};
+  XsyncIns()->initialize(&config);
+  XsyncIns()->registerOnConnectStateChangeCallback([this](string targetIp, bool state) {
+    ZLOGI(TAG, "targetIp:%s,state:%d", targetIp.c_str(), state);
+    if (state) {
+      emit doinui_signal(QFunction([this, targetIp]() { ui->IpInput->setText(QString::fromStdString(targetIp)); }));
+    } else {
+      emit doinui_signal(QFunction([this, targetIp]() { ui->IpInput->setText(QString::fromStdString("disconnect")); }));
+    }
+  });
   XsyncIns()->registerOnTimecodeMsgCallback([this](XsyncTimecode_t *timecode_msg) {  //
     XsyncTimecode_t timecode = *timecode_msg;
     QString         text     = QString(fmt("%02d:%02d:%02d:%02d", timecode.hour, timecode.minute, timecode.second, timecode.frame));
@@ -533,7 +543,7 @@ void MainWindow::on_ClearLogButton_clicked() {  //
   ui->logbrowser->clear();
 }
 void MainWindow::on_Connect2XsyncButton_clicked() {  //
-  XsyncIns()->changeXsyncIp(ui->IpInput->text().toStdString());
+  // XsyncIns()->changeXsyncIp(ui->IpInput->text().toStdString());
 }
 void MainWindow::mainWindowsRun() {  //
 }
@@ -553,7 +563,7 @@ void MainWindow::on_GenNewMac_clicked() { DO_XSYNC_FUNC(XsyncIns()->generatorNew
 void MainWindow::on_FactoryReset_clicked() { DO_XSYNC_FUNC(XsyncIns()->factoryReset()); }
 void MainWindow::on_Reboot_clicked() { DO_XSYNC_FUNC(XsyncIns()->reboot()); }
 void MainWindow::on_ChangeNetCfg_clicked() {  //
-  DO_XSYNC_FUNC(XsyncIns()->changeNetworkConfig(ui->ChangeNetCfg_ip->text().toStdString(), ui->ChangeNetCfg_mask->text().toStdString(), ui->ChangeNetCfg_gateway->text().toStdString()));
+  // DO_XSYNC_FUNC(XsyncIns()->changeNetworkConfig(ui->ChangeNetCfg_ip->text().toStdString(), ui->ChangeNetCfg_mask->text().toStdString(), ui->ChangeNetCfg_gateway->text().toStdString()));
 }
 
 void MainWindow::on_TimecodePage_Read_clicked() {