修正ci拉取代码步骤。

完善CI构建。
减小打包体积。
2024-11-14 12:15:48 +08:00 · 2024-11-14 12:11:59 +08:00 · 2024-11-14 11:20:32 +08:00 · 2024-11-13 14:54:14 +08:00 · 2024-11-13 14:40:10 +08:00 · 2024-11-13 14:25:22 +08:00
9 changed files with 262 additions and 38 deletions
--- a/.gitea/workflows/release_windows.yaml
+++ b/.gitea/workflows/release_windows.yaml
@ -8,8 +8,18 @@ jobs:
  build:
    runs-on: [windows11] 
    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
+    - name: Clone repository
+      run: |
+        $ref = "${{ github.ref }}"
+        if ($ref -like 'refs/heads/*') {
+          $branch = $ref -replace '^refs/heads/', ''
+        } elseif ($ref -like 'refs/tags/*') {
+          $branch = $ref -replace '^refs/tags/', ''
+        } else {
+          $branch = $ref
+        }
+        git clone --depth 1 --branch=$branch https://${{ secrets.GIT_USERNAME }}:${{ secrets.GIT_PASSWORD }}@amass.fun/gitea/${{ gitea.repository }}.git .
+        git checkout ${{ github.sha }}    
    - name: Build and deploy
      run: |
        resources/build.ps1 build
@ -20,4 +30,4 @@ jobs:
      with:
        body_path: build/CHANGELOG.txt
        files: |-
-          build/AntiClipSettings.zip
+          build/视觉防夹设备上位机工具*.zip
--- a/Application.cpp
+++ b/Application.cpp
@ -40,7 +40,7 @@ Application::Application(int &argc, char **argv)
    font.setFamily("微软雅黑");
    m_app->setFont(font);
    m_app->setApplicationName(APPLICATION_NAME);
-    m_app->setApplicationVersion(QString("V%1").arg(APP_VERSION));
+    m_app->setApplicationVersion(QString("v%1").arg(APP_VERSION));
    m_player->open();
 }

@ -164,6 +164,35 @@ void Application::updateShieldedAreaPoints(const QList<QPointF> &points) {
    }
 }

+bool Application::currentDeviceFlip() const {
+    return m_currentDeviceFlip;
+}
+void Application::setCurrentDeviceFlip(bool flip) {
+    if (m_currentDeviceFlip != flip) {
+        m_currentDeviceFlip = flip;
+        emit currentDeviceFlipChanged();
+        if (!m_device.expired()) {
+            auto device = m_device.lock();
+            device->updateFlip(flip);
+        }
+    }
+}
+
+int Application::currentDeviceRotation() const {
+    return m_currentDeviceRotation;
+}
+
+void Application::setCurrentDeviceRotation(int rotation) {
+    if (m_currentDeviceRotation != rotation) {
+        m_currentDeviceRotation = rotation;
+        emit currentDeviceRotationChanged();
+        if (!m_device.expired()) {
+            auto device = m_device.lock();
+            device->updateRotation(rotation);
+        }
+    }
+}
+
 void Application::updateNetworkInfomation(bool dhcp, const QString &ip, const QString &netmask, const QString &gateway,
                                          const QString &dns) {
    if (!m_device.expired()) {
@ -180,6 +209,8 @@ void Application::updateNetworkInfomation(bool dhcp, const QString &ip, const QS
 void Application::connectToDevice(int index) {
    if (!m_device.expired()) {
        auto device = m_device.lock();
+        disconnect(device.get(), &DeviceConnection::rotationChanged, this, &Application::onDeviceRotationChanged);
+        disconnect(device.get(), &DeviceConnection::flipChanged, this, &Application::onDeviceFlipChanged);
        disconnect(device.get(), &DeviceConnection::openDoorAreaChanged, this, &Application::onDeviceOpenDoorArea);
        disconnect(device.get(), &DeviceConnection::shieldedAreaChanged, this, &Application::onDeviceShieldedArea);
        disconnect(device.get(), &DeviceConnection::antiClipAreaChanged, this, &Application::onDeviceAntiClipArea);
@ -202,6 +233,8 @@ void Application::connectToDevice(int index) {
        auto device = m_devices->device(index);
        m_device = device;

+        connect(device.get(), &DeviceConnection::rotationChanged, this, &Application::onDeviceRotationChanged);
+        connect(device.get(), &DeviceConnection::flipChanged, this, &Application::onDeviceFlipChanged);
        connect(device.get(), &DeviceConnection::openDoorAreaChanged, this, &Application::onDeviceOpenDoorArea);
        connect(device.get(), &DeviceConnection::shieldedAreaChanged, this, &Application::onDeviceShieldedArea);
        connect(device.get(), &DeviceConnection::antiClipAreaChanged, this, &Application::onDeviceAntiClipArea);
@ -220,16 +253,20 @@ void Application::connectToDevice(int index) {
            }
        });
        device->setLiveStreamEnabled(true);
-        auto area = device->area();
-        m_currentOpenDoorAreaWay = area.openDoorAreaWay;
-        m_currentOpenDoorAreaPoints = area.openDoorArea;
-        m_currentShieldedAreaEnabled = area.shieldedAreaEnabled;
-        m_currentShieldedAreaPoints = area.shieldedArea;
-        m_currentAntiClipAreaEnabled = area.antiClipAreaEnabled;
-        m_currentAntiClipAreaPoints = area.antiClipArea;
+        auto info = device->infomation();
+        m_currentOpenDoorAreaWay = info.openDoorAreaWay;
+        m_currentOpenDoorAreaPoints = info.openDoorArea;
+        m_currentShieldedAreaEnabled = info.shieldedAreaEnabled;
+        m_currentShieldedAreaPoints = info.shieldedArea;
+        m_currentAntiClipAreaEnabled = info.antiClipAreaEnabled;
+        m_currentAntiClipAreaPoints = info.antiClipArea;
        m_currentNetworkInfomation = device->networkInfomation();
        m_currentFirmware = device->infomation().firmwareVersion;
        m_currentDeviceConnected = device->isConnected();
+        m_currentDeviceFlip = info.flip;
+        m_currentDeviceRotation = info.rotation;
+        emit currentDeviceRotationChanged();
+        emit currentDeviceFlipChanged();
        emit currentOpenDoorAreaPointsChanged();
        emit currentShieldedAreaPointsChanged();
        emit currentAntiClipAreaPointsChanged();
@ -258,9 +295,10 @@ void Application::upgradeDevice(const QString &file) {
    int position = baseName.indexOf(versionPrefix);
    if (position < 0 || ((baseName.length() - position) < std::strlen(version))) {
        emit newMessage(2, "OTA升级", "文件名格式不合法!");
+        LOG(error) << "baseName: " << baseName.toStdString() << ", position: " << position;
        return;
    }
-    QString firmware = baseName.mid(position, std::strlen(version));
+    QString firmware = baseName.mid(position);
    if (device->isConnected()) {
        device->requestOta(firmware, file);
    } else {
@ -273,6 +311,13 @@ void Application::onDeviceOpenDoorArea(DeviceConnection::AreaWay way, const QLis
    setCurrentOpenDoorAreaPoints(points);
 }

+void Application::onDeviceRotationChanged(int rotation) {
+    setCurrentDeviceRotation(rotation);
+}
+void Application::onDeviceFlipChanged(bool flip) {
+    setCurrentDeviceFlip(flip);
+}
+
 void Application::onDeviceShieldedArea(bool enabled, const QList<QPointF> &points) {
    setCurrentShieldedAreaEnabled(enabled);
    setCurrentShieldedAreaPoints(points);
--- a/Application.h
+++ b/Application.h
@ -40,6 +40,10 @@ class Application : public QObject {
        NetworkInfomation currentNetworkInfomation READ currentNetworkInfomation NOTIFY currentNetworkInfomationChanged)
    Q_PROPERTY(QString currentFirmware MEMBER m_currentFirmware NOTIFY currentFirmwareChanged)
    Q_PROPERTY(bool currentDeviceConnected MEMBER m_currentDeviceConnected NOTIFY currentDeviceConnectedChanged)
+
+    Q_PROPERTY(bool currentDeviceFlip READ currentDeviceFlip WRITE setCurrentDeviceFlip NOTIFY currentDeviceFlipChanged)
+    Q_PROPERTY(int currentDeviceRotation READ currentDeviceRotation WRITE setCurrentDeviceRotation NOTIFY
+                   currentDeviceRotationChanged)
    friend class Amass::Singleton<Application>;

 public:
@ -64,6 +68,12 @@ public:
    QList<QPointF> currentAntiClipAreaPoints() const;
    void setCurrentAntiClipAreaPoints(const QList<QPointF> &points);

+    bool currentDeviceFlip() const;
+    void setCurrentDeviceFlip(bool flip);
+
+    int currentDeviceRotation() const;
+    void setCurrentDeviceRotation(int rotation);
+
    Q_INVOKABLE void updateOpenDoorAreaPoints(const QList<QPointF> &points);
    Q_INVOKABLE void updateAntiClipAreaPoints(const QList<QPointF> &points);
    Q_INVOKABLE void updateShieldedAreaPoints(const QList<QPointF> &points);
@ -88,10 +98,14 @@ signals:
    void currentFirmwareChanged();
    void currentDeviceConnectedChanged();
    void currentDeviceOtaProgressChanged(bool status, int progress, const QString &message);
+    void currentDeviceFlipChanged();
+    void currentDeviceRotationChanged();
    void newMessage(int type, const QString &title, const QString &message);

 protected:
    Application(int &argc, char **argv);
+    void onDeviceRotationChanged(int rotation);
+    void onDeviceFlipChanged(bool flip);
    void onDeviceOpenDoorArea(DeviceConnection::AreaWay way, const QList<QPointF> &points);
    void onDeviceShieldedArea(bool enabled, const QList<QPointF> &points);
    void onDeviceAntiClipArea(bool enabled, const QList<QPointF> &points);
@ -118,6 +132,8 @@ private:
    NetworkInfomation m_currentNetworkInfomation;
    QString m_currentFirmware;
    bool m_currentDeviceConnected = false;
+    bool m_currentDeviceFlip = false;
+    int m_currentDeviceRotation = 0;
 };

 #endif // APPLICATION_H
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)

-project(AntiClipSettings VERSION 1.4 LANGUAGES C CXX)
+project(AntiClipSettings VERSION 1.5 LANGUAGES C CXX)
 set(APPLICATION_NAME "视觉防夹设备上位机工具")

 set(CMAKE_CXX_STANDARD 17)
@ -18,6 +18,7 @@ if (Qt6_FOUND)
    add_compile_definitions(
        BOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN10
    )
+    set(FFmpeg_ROOT ${Libraries_ROOT}/ffmpeg-7.0.2-full_build-shared)
 else()
    add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
    add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
@ -25,6 +26,7 @@ else()
    set(CMAKE_AUTORCC ON)
    set(BOOST_ROOT ${Libraries_ROOT}/boost_1_83_0_msvc2022_64bit)
    set(Boost_INCLUDE_DIR ${BOOST_ROOT}/include/boost-1_83)
+    set(FFmpeg_ROOT ${Libraries_ROOT}/ffmpeg-6.1.1-full_build-shared)
 endif()
 option(Boost_USE_STATIC_LIBS OFF)

@ -33,15 +35,20 @@ set(OPENSSL_INCLUDE_DIR ${OpenSSL_ROOT}/include)
 set(OpenSSL_LIBRARY_DIRS ${OpenSSL_ROOT}/lib)
 set(OpenSSL_LIBRARIES libssl libcrypto)

-set(FFmpeg_ROOT ${Libraries_ROOT}/ffmpeg-7.0.2-full_build-shared)
 set(FFmpeg_INCLUDE_DIR ${FFmpeg_ROOT}/include)
 set(FFmpeg_LIB_DIR ${FFmpeg_ROOT}/lib)

 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
    set(JPEGTURBO_ROOT ${Libraries_ROOT}/libjpeg-turbo-3.0.3_msvc2022_64bit_debug)
+    set(MBEDTLS_ROOT ${Libraries_ROOT}/mbedtls-3.6.2_msvc2022_64bit_debug)
 else()
    set(JPEGTURBO_ROOT ${Libraries_ROOT}/libjpeg-turbo-3.0.3_msvc2022_64bit_release)
+    set(MBEDTLS_ROOT ${Libraries_ROOT}/mbedtls-3.6.2_msvc2022_64bit_release)
 endif()
+
+set(MBEDTLS_INCLUDE_DIR ${MBEDTLS_ROOT}/include)
+set(MBEDTLS_LIBRARY_DIRS ${MBEDTLS_ROOT}/lib)
+
 set(JPEGTURBO_INCLUDE_DIR ${JPEGTURBO_ROOT}/include)
 set(JPEGTURBO_LIB_DIR ${JPEGTURBO_ROOT}/lib)

@ -102,7 +109,7 @@ set_target_properties(AntiClipSettings PROPERTIES
 include(CPack)
 include(FetchContent)
 FetchContent_Declare(Kylin
-    GIT_REPOSITORY https://gitea.amass.fun/amass/Kylin.git
+    GIT_REPOSITORY https://amass.fun/gitea/amass/Kylin.git
 )
 set(KYLIN_WITH_FLUENT OFF)
 FetchContent_MakeAvailable(Kylin)
--- a/DeviceConnection.cpp
+++ b/DeviceConnection.cpp
@ -73,10 +73,6 @@ void DeviceConnection::connect(const Infomation &infomation) {
    m_h264Socket->connectToHost(infomation.ip, 8000);
 }

-DeviceConnection::Area DeviceConnection::area() const {
-    return m_area;
-}
-
 NetworkInfomation DeviceConnection::networkInfomation() const {
    return m_networkInfomation;
 }
@ -262,6 +258,44 @@ void DeviceConnection::requestResolution(Resolution resolution) {
    m_requests.push(task);
 }

+void DeviceConnection::updateRotation(int rotation) {
+    Task task;
+    task.command = "a23imagerotate_setdata";
+    task.task = [this, rotation]() {
+        boost::json::object request;
+        request["func"] = "a23imagerotate_setdata";
+        request["deviceid"] = "0";
+        boost::json::object data;
+        data["value"] = std::to_string(rotation);
+        request["data"] = std::move(data);
+        auto text = boost::json::serialize(request);
+        m_commandSocket->write(text.data(), text.size());
+        LOG(info) << "updateRotation: " << text;
+    };
+    if (m_requests.empty()) {
+        task.task();
+    }
+    m_requests.push(task);
+}
+void DeviceConnection::updateFlip(bool flip) {
+    Task task;
+    task.command = "a04imageflipping_setdata";
+    task.task = [this, flip]() {
+        boost::json::object request;
+        request["func"] = "a04imageflipping_setdata";
+        request["deviceid"] = "0";
+        boost::json::object data;
+        data["value"] = flip ? "2" : "1";
+        request["data"] = std::move(data);
+        auto text = boost::json::serialize(request);
+        m_commandSocket->write(text.data(), text.size());
+    };
+    if (m_requests.empty()) {
+        task.task();
+    }
+    m_requests.push(task);
+}
+
 void DeviceConnection::requestVersion() {
    Task task;
    task.command = "a15devicedetail_getdata";
@ -281,6 +315,27 @@ void DeviceConnection::requestVersion() {
    m_requests.push(task);
 }

+void DeviceConnection::requestVideoInformation() {
+    constexpr const char *commands[] = {"a23imagerotate_getdata", "a04imageflipping_getdata"};
+    for (auto command : commands) {
+        Task task;
+        task.command = command;
+        task.task = [this, command]() {
+            boost::json::object request;
+            request["func"] = command;
+            request["deviceid"] = "0";
+            boost::json::object data;
+            request["data"] = std::move(data);
+            auto text = boost::json::serialize(request);
+            m_commandSocket->write(text.data(), text.size());
+        };
+        if (m_requests.empty()) {
+            task.task();
+        }
+        m_requests.push(task);
+    }
+}
+
 void DeviceConnection::requestNetworkInfomation() {
    Task task;
    task.command = "netconfig_getdata";
@ -457,8 +512,8 @@ QString DeviceConnection::handleCommand(const std::string_view &replyText, const
        } else if (value == "2") {
            way = Quadrangle;
        }
-        m_area.openDoorAreaWay = way;
-        m_area.openDoorArea = points;
+        m_infomation.openDoorAreaWay = way;
+        m_infomation.openDoorArea = points;
        emit openDoorAreaChanged(way, points);
    } else if (function == "a03opendoor4_getdata") {
        auto &data = reply.at("data").as_object();
@ -472,8 +527,8 @@ QString DeviceConnection::handleCommand(const std::string_view &replyText, const
            point.setY(obj.at("y").as_double());
            points.push_back(point);
        }
-        m_area.shieldedAreaEnabled = value == "1";
-        m_area.shieldedArea = points;
+        m_infomation.shieldedAreaEnabled = value == "1";
+        m_infomation.shieldedArea = points;
        emit shieldedAreaChanged(value == "1", points);
    } else if (function == "a03opendoor5_getdata") {
        auto &data = reply.at("data").as_object();
@ -487,8 +542,8 @@ QString DeviceConnection::handleCommand(const std::string_view &replyText, const
            point.setY(obj.at("y").as_double());
            points.push_back(point);
        }
-        m_area.antiClipAreaEnabled = value == "1";
-        m_area.antiClipArea = points;
+        m_infomation.antiClipAreaEnabled = value == "1";
+        m_infomation.antiClipArea = points;
        emit antiClipAreaChanged(value == "1", points);
    } else if (function == "netconfig_getdata") {
        auto &data = reply.at("data").as_object();
@ -579,6 +634,40 @@ QString DeviceConnection::handleCommand(const std::string_view &replyText, const
            }
            emit otaProgressChanged(false, m_otaProgress, tip);
        }
+    } else if (function == "a23imagerotate_getdata") {
+        // {"data":{"value":"2"},"deviceid":"0","flag":"ok","func":"a23imagerotate_getdata"}
+        auto &data = reply.at("data").as_object();
+        auto &value = data.at("value").as_string();
+        m_infomation.rotation = std::stoi(static_cast<std::string>(value));
+        emit rotationChanged(m_infomation.rotation);
+    } else if (function == "a04imageflipping_getdata") {
+        // {"data":{"value":"1"},"deviceid":"0","flag":"ok","func":"a04imageflipping_getdata"}
+        auto &data = reply.at("data").as_object();
+        auto &value = data.at("value").as_string();
+        m_infomation.flip = value == "2";
+        emit flipChanged(m_infomation.flip);
+    } else if (function == "a04imageflipping_setdata") {
+        if ((task != nullptr) && (task->command.toStdString() == function)) {
+            if (task->timeoutTimer) {
+                task->timeoutTimer->stop();
+            }
+            bool status = true;
+            if (task->future) {
+                task->future->reportFinished(&status);
+            }
+        }
+        requestVideoInformation();
+    } else if (function == "a23imagerotate_setdata") {
+        if ((task != nullptr) && (task->command.toStdString() == function)) {
+            if (task->timeoutTimer) {
+                task->timeoutTimer->stop();
+            }
+            bool status = true;
+            if (task->future) {
+                task->future->reportFinished(&status);
+            }
+        }
+        requestVideoInformation();
    } else {
        LOG(warning) << "unknown reply: " << replyText;
    }
@ -593,6 +682,7 @@ void DeviceConnection::onConnected() {
        requestShieldedArea();
        requestAntiClipArea();
        requestNetworkInfomation();
+        requestVideoInformation();
        emit connected();
        m_timerId = startTimer(2500);
        if (m_otaProgress == 99) {
--- a/DeviceConnection.h
+++ b/DeviceConnection.h
@ -34,11 +34,10 @@ public:
        QString softwareVersion;
        QString firmwareVersion;
        QString ip;
-    };
-    Q_ENUM(AreaWay)

-    class Area {
-    public:
+        int rotation = 0;
+        bool flip = false;
+
        QList<QPointF> openDoorArea;
        AreaWay openDoorAreaWay;

@ -48,6 +47,7 @@ public:
        QList<QPointF> antiClipArea;
        bool antiClipAreaEnabled;
    };
+    Q_ENUM(AreaWay)

    using H264FrameCallback = std::function<void(const char *data, uint32_t size)>;
    DeviceConnection(QObject *parent = nullptr);
@ -60,7 +60,6 @@ public:
    void setLiveStreamEnabled(bool enabled);

    NetworkInfomation networkInfomation() const;
-    Area area() const;

    void requestOpenDoorArea();
    QFuture<bool> updateOpenDoorAreaPoints(AreaWay way, const QList<QPointF> &points);
@ -73,6 +72,9 @@ public:
    QFuture<bool> updateNetworkInfomation(bool dhcp, const QString &ip, const QString &netmask, const QString &gateway,
                                          const QString &dns);
    void requestVersion();
+    void requestVideoInformation();
+    void updateRotation(int rotation);
+    void updateFlip(bool flip);

    /**
     * @brief 对设备升级OTA,主要有几个步骤
@ -91,6 +93,8 @@ signals:
    void openDoorAreaChanged(AreaWay way, const QList<QPointF> &points);
    void shieldedAreaChanged(bool enabled, const QList<QPointF> &points);
    void antiClipAreaChanged(bool enabled, const QList<QPointF> &points);
+    void rotationChanged(int rotation);
+    void flipChanged(bool flip);
    void networkInfomationChanged(const NetworkInfomation &info);
    void firmwareChanged(const QString &firmware);
    void otaProgressChanged(bool status, int progress, const QString &message);
@ -133,7 +137,6 @@ private:
    std::queue<Task> m_requests;
    int m_timerId = -1;
    int heartbeats = 0;
-    Area m_area;
    NetworkInfomation m_networkInfomation;
    QString m_firmware;
 };
--- a/qml/DeviceView.qml
+++ b/qml/DeviceView.qml
@ -16,6 +16,9 @@ Item {
    property color antiClipAreaColor: "blue"
    property var antiClipAreaPoints: []
    property bool antiClipAreaEnabled: false
+    property alias flip: flipSwitch.checked
+    property alias videoRotation: rotateComboBox.currentIndex
+
    Item {
        anchors.left: parent.left
        anchors.right: parent.right
@ -246,6 +249,35 @@ Item {
        columns: 2
        spacing: 10
        verticalItemAlignment: Qt.AlignVCenter
+
+        Label { text: qsTr("图像: ") }
+
+        Row {
+            enabled: root.enabled
+            Label {
+                anchors.verticalCenter: parent.verticalCenter
+                text: qsTr("旋转")
+            }
+            Item {width: 10; height:10}
+            ComboBox {
+                id: rotateComboBox
+                model: ["0°","90°","180°","270°"]
+                onCurrentIndexChanged: {
+                    App.currentDeviceRotation = rotateComboBox.currentIndex
+                }
+            }
+            Item {width: 70; height:10}
+            Label {
+                anchors.verticalCenter: parent.verticalCenter
+                text: qsTr("翻转")
+            }
+            Item {width: 10; height:10}
+            Switch {
+                id: flipSwitch
+                onToggled:  App.currentDeviceFlip=flipSwitch.checked
+            }
+        }
+
        Label {
            text: qsTr("开门区域: ")
        }
--- a/qml/Main.qml
+++ b/qml/Main.qml
@ -119,6 +119,8 @@ ApplicationWindow {
        shieldedAreaPoints: App.currentShieldedAreaPoints
        antiClipAreaEnabled: App.currentAntiClipAreaEnabled
        antiClipAreaPoints: App.currentAntiClipAreaPoints
+        flip: App.currentDeviceFlip
+        videoRotation: App.currentDeviceRotation
    }

    NetworkSettingPopup {
--- a/resources/build.ps1
+++ b/resources/build.ps1
@ -1,4 +1,5 @@
-param($type)
+param($type)
+# 该脚本设置为 UTF8-bom 编码即可支持中文

 $MsvcScript = 'D:\Program Files\Microsoft Visual Studio\2022\\Community\Common7\Tools\Launch-VsDevShell.ps1'
 if (!(Test-Path $MsvcScript)) { $MsvcScript = 'D:\Program Files\Microsoft Visual Studio\2022\\Professional\Common7\Tools\Launch-VsDevShell.ps1' }
@ -10,12 +11,22 @@ $openSSLRoot = "D:\Qt\Tools\OpenSSLv3\Win_x64"
 $librariesPath = "E:\Projects\Libraries"
 if (!(Test-Path $librariesPath)) { $librariesPath = "D:\Projects\Libraries" }
 $boostRoot = "$librariesPath\boost_1_83_0_msvc2022_64bit"
-$ffmpegRoot = "$librariesPath\ffmpeg-7.0.2-full_build-shared"
+
+# 6.1.1 版本支持 windows7
+$ffmpegRoot = "$librariesPath\ffmpeg-6.1.1-full_build-shared"

 $projectPath = Get-Location
 $buildPath = Join-Path -Path $projectPath -ChildPath "build"
-$deployPath = Join-Path -Path $buildPath -ChildPath "AntiClipSettings"
-$zipFilePath = Join-Path -Path $buildPath -ChildPath "AntiClipSettings.zip"
+
+$fileContent = (Get-Content -Path "CMakeLists.txt") -join " "
+if ($fileContent -match 'project\([^\)]+VERSION\s+([0-9]+\.[0-9]+)') {
+    $version = $Matches[1]
+} else {
+    Write-Output "未找到版本号"
+}
+
+$deployPath = Join-Path -Path $buildPath -ChildPath "视觉防夹设备上位机工具v$version"
+$zipFilePath = Join-Path -Path $buildPath -ChildPath "视觉防夹设备上位机工具v$version.zip"
 $changelogPath = Join-Path -Path $buildPath -ChildPath "CHANGELOG.txt"

 function Build() {
@ -36,8 +47,15 @@ function Deploy() {
        Remove-Item $deployPath -Recurse -Force
    }
    New-Item $deployPath -ItemType Directory
-    Copy-Item $buildPath\AntiClipSettings.exe  $deployPath\AntiClipSettings.exe
-    & $qtHome\bin\windeployqt.exe $deployPath\AntiClipSettings.exe --qmldir=$qtHome\qml
+    Copy-Item $buildPath\AntiClipSettings.exe  $deployPath\视觉防夹设备上位机工具v$version.exe
+    & $qtHome\bin\windeployqt.exe $deployPath\视觉防夹设备上位机工具v$version.exe --qmldir=$qtHome\qml
+    Remove-Item -Path $deployPath\d3dcompiler_47.dll -Force
+    Remove-Item -Path $deployPath\Qt5RemoteObjects.dll -Force
+    Remove-Item -Path $deployPath\Qt5QuickTest.dll -Force
+    Remove-Item -Path $deployPath\translations -Recurse -Force   # 暂时不需要翻译文件
+    Remove-Item -Path $deployPath\qmltooling -Recurse -Force
+    Remove-Item -Path $deployPath\QtTest -Recurse -Force
+    Remove-Item -Path $deployPath\QtGraphicalEffects -Recurse -Force
    

    # $modules = "QmlCore"
@ -61,7 +79,8 @@ function Deploy() {
        Copy-Item -Path $boostRoot\lib\boost_$boost-vc143-mt-x64-1_83.dll -Destination $deployPath
    }

-    $ffmpegs = "avcodec-61", "avdevice-61", "avfilter-10", "avformat-61", "avutil-59", "postproc-58", "swresample-5", "swscale-8"
+    # 暂时不需要 avfilter-9、avformat-60
+    $ffmpegs = "avcodec-60", "avdevice-60", "avutil-58", "postproc-57", "swresample-4", "swscale-7"
    foreach ($ffmpeg in $ffmpegs) {  
        Copy-Item -Path $ffmpegRoot\bin\$ffmpeg.dll -Destination $deployPath
    }
Author	SHA1	Message	Date
amass	d0966cfcc7	修正ci拉取代码步骤。 All checks were successful Release tag / build (push) Successful in 2m53s Details	2024-11-14 12:15:48 +08:00
amass	d6a36c0450	完善CI构建。 Some checks failed Release tag / build (push) Failing after 49s Details	2024-11-14 12:11:59 +08:00
amass	27e5db45d6	减小打包体积。	2024-11-14 11:20:32 +08:00
luocai	51f9a2af52	打包时显示版本号。	2024-11-13 14:54:14 +08:00
luocai	0b3198c90e	修正编译条件。	2024-11-13 14:40:10 +08:00
luocai	f55d3aa9df	实现视频旋转及翻转指令控制。	2024-11-13 14:25:22 +08:00
luocai	bf3ad2be2f	修改升级文件校验。	2024-10-21 19:35:49 +08:00
luocai	f230e4cc8b	update ffmpeg ver.	2024-10-21 17:00:48 +08:00