11 changed files with 59 additions and 34 deletions
--- a/.github/workflows/macos-shared.yml
+++ b/.github/workflows/macos-shared.yml
@ -55,19 +55,19 @@ jobs:
          # 先删除所有dSYM文件，减少包的体积
          sudo find /Users/runner/work/RibbonUI/Qt/6.5.3/macos/qml -name "*.dSYM" | xargs rm -r
          # 拷贝依赖
-          sudo macdeployqt /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${targetName}.app -qmldir=. -verbose=1 -dmg
+          sudo macdeployqt /Users/runner/work/ProtocolParser/ProtocolParser/build/app_source/${targetName}.app -qmldir=. -verbose=1 -dmg
          
      - uses: actions/upload-artifact@v2
        with:
          name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared.zip
-          path: /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${{ env.targetName }}.dmg
+          path: /Users/runner/work/ProtocolParser/ProtocolParser/build/app_source/${{ env.targetName }}.dmg
          
      - name: uploadRelease
        if: startsWith(github.event.ref, 'refs/tags/')
        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${{ env.targetName }}.dmg
+          file: /Users/runner/work/ProtocolParser/ProtocolParser/build/app_source/${{ env.targetName }}.dmg
          asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_shared.dmg
          tag: ${{ github.ref }}
          overwrite: true
--- a/.github/workflows/macos-static.yml
+++ b/.github/workflows/macos-static.yml
@ -55,19 +55,19 @@ jobs:
          # 先删除所有dSYM文件，减少包的体积
          sudo find /Users/runner/work/RibbonUI/Qt/6.5.3/macos/qml -name "*.dSYM" | xargs rm -r
          # 拷贝依赖
-          macdeployqt /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${targetName}.app -qmldir=. -verbose=1 -dmg     
+          macdeployqt /Users/runner/work/ProtocolParser/ProtocolParser/build/app_source/${targetName}.app -qmldir=. -verbose=1 -dmg     
          
      - uses: actions/upload-artifact@v2
        with:
          name: ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_static.zip
-          path: /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${{ env.targetName }}.dmg
+          path: /Users/runner/work/ProtocolParser/ProtocolParser/build/app_source/${{ env.targetName }}.dmg
          
      - name: uploadRelease
        if: startsWith(github.event.ref, 'refs/tags/')
        uses: svenstaro/upload-release-action@v2
        with:
          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${{ env.targetName }}.dmg
+          file: /Users/runner/work/ProtocolParser/ProtocolParser/build/app_source/${{ env.targetName }}.dmg
          asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.dmg
          tag: ${{ github.ref }}
          overwrite: true
--- a/.github/workflows/ubuntu-shared.yml
+++ b/.github/workflows/ubuntu-shared.yml
@ -71,7 +71,7 @@ jobs:
          # make sure Qt plugin finds QML sources so it can deploy the imported files
          export QML_SOURCES_PATHS=./
          # 拷贝依赖
-          linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=/home/runner/work/ProtocolParser/ProtocolParser/build/app/release/${targetName} --appdir /home/runner/work/ProtocolParser/ProtocolParser/build/app/release/
+          linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=/home/runner/work/ProtocolParser/ProtocolParser/build/app_source/${targetName} --appdir /home/runner/work/ProtocolParser/ProtocolParser/build/app_source/
          mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared.AppImage
        
      - uses: actions/upload-artifact@v2
--- a/.github/workflows/ubuntu-static.yml
+++ b/.github/workflows/ubuntu-static.yml
@ -71,7 +71,7 @@ jobs:
          # make sure Qt plugin finds QML sources so it can deploy the imported files
          export QML_SOURCES_PATHS=./
          # 拷贝依赖
-          linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=/home/runner/work/ProtocolParser/ProtocolParser/build/app/release/${targetName} --appdir /home/runner/work/ProtocolParser/ProtocolParser/build/app/release/
+          linuxdeploy-x86_64.AppImage --plugin=qt --output=appimage --create-desktop-file --icon-file=${targetName}.svg --executable=/home/runner/work/ProtocolParser/ProtocolParser/build/app_source/${targetName} --appdir /home/runner/work/ProtocolParser/ProtocolParser/build/app_source/
          mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.AppImage
        
      - uses: actions/upload-artifact@v2
--- a/3rdparty/RibbonUI
+++ b/3rdparty/RibbonUI
@ -1 +1 @@
-Subproject commit b56ab042b49e1ad72242d79153edc74fd4f3bc3c
+Subproject commit bca8bafa5ee0dbe39b8f887fb4096ef39886aa92
--- a/app_source/CMakeLists.txt
+++ b/app_source/CMakeLists.txt
@ -31,12 +31,6 @@ set(
 INCLUDE_DIRECTORIES(dlln3x include)
 add_subdirectory(sm_crypto)

-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/app/debug)
-else()
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/app/release)
-endif()
-
 if (WIN32)
    set(app_icon_resource_windows resources/icon.rc)
    qt_add_executable(${PROJECT_NAME}
@ -54,7 +48,7 @@ if (WIN32)
    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
        COMMAND ${CMAKE_COMMAND} -E copy
        ${DLL_FILES}
-        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+        "${CMAKE_BINARY_DIR}${PATH_SEPARATOR}app_source"
    )
 elseif(APPLE)
    set(MACOSX_BUNDLE_ICON_FILE AppIcon)
--- a/app_source/dlln3x/zigbeeframe.h
+++ b/app_source/dlln3x/zigbeeframe.h
@ -163,8 +163,6 @@ public:
    void load_package(QList<uint8_t>& buf) { load_package(buf.constData(), buf.size()); };
    void load_package(const uint8_t* buf, uint8_t length)
    {
-        if (length < 7) // len < 7 means pkg is corrupted
-            return;
        _packed_data.clear();
        for (uint8_t i = 0; i < length; i++) {
            _package.append(buf[i]);
--- a/app_source/qml/components/DeviceList.qml
+++ b/app_source/qml/components/DeviceList.qml
@ -143,8 +143,12 @@ Item{
                        {
                            deny.push(ZigBeeParser.wait_queue[list.current_index])
                            ZigBeeParser.deny_list = deny
-                            data = ZigBeeParser.wait_queue
-                            data.splice(list.current_index,1)
+                            for (var i = 0; i < ZigBeeParser.wait_queue.length; i++)
+                            {
+                                if (i === list.current_index)
+                                    continue
+                                data.push(ZigBeeParser.wait_queue[i])
+                            }
                            ZigBeeParser.wait_queue = data
                            break
                        }
@ -152,8 +156,12 @@ Item{
                        {
                            deny.push(ZigBeeParser.allow_list[list.current_index])
                            ZigBeeParser.deny_list = deny
-                            data = ZigBeeParser.allow_list
-                            data.splice(list.current_index,1)
+                            for (let i = 0; i < ZigBeeParser.allow_list.length; i++)
+                            {
+                                if (i === list.current_index)
+                                    continue
+                                data.push(ZigBeeParser.allow_list[i])
+                            }
                            ZigBeeParser.allow_list = data
                            break
                        }
@ -162,8 +170,13 @@ Item{
                            let allow = ZigBeeParser.allow_list
                            allow.push(ZigBeeParser.deny_list[list.current_index])
                            ZigBeeParser.allow_list = allow
-                            data = ZigBeeParser.deny_list
-                            data.splice(list.current_index,1)
+                            let data = []
+                            for (let i = 0; i < ZigBeeParser.deny_list.length; i++)
+                            {
+                                if (i === list.current_index)
+                                    continue
+                                data.push(ZigBeeParser.deny_list[i])
+                            }
                            ZigBeeParser.deny_list = data
                            break
                        }
@ -183,22 +196,37 @@ Item{
                        let allow = ZigBeeParser.allow_list
                        allow.push(ZigBeeParser.wait_queue[list.current_index])
                        ZigBeeParser.allow_list = allow
-                        var data = ZigBeeParser.wait_queue
-                        data.splice(list.current_index,1)
+                        var data = []
+                        for (var i = 0; i < ZigBeeParser.wait_queue.length; i++)
+                        {
+                            if (i === list.current_index)
+                                continue
+                            data.push(ZigBeeParser.wait_queue[i])
+                        }
                        ZigBeeParser.wait_queue = data
                        break
                    }
                    case 1:
                    {
-                        let data = ZigBeeParser.allow_list
-                        data.splice(list.current_index,1)
+                        let data = []
+                        for (let i = 0; i < ZigBeeParser.allow_list.length; i++)
+                        {
+                            if (i === list.current_index)
+                                continue
+                            data.push(ZigBeeParser.allow_list[i])
+                        }
                        ZigBeeParser.allow_list = data
                        break
                    }
                    case 2:
                    {
-                        let data = ZigBeeParser.deny_list
-                        data.splice(list.current_index,1)
+                        let data = []
+                        for (let i = 0; i < ZigBeeParser.deny_list.length; i++)
+                        {
+                            if (i === list.current_index)
+                                continue
+                            data.push(ZigBeeParser.deny_list[i])
+                        }
                        ZigBeeParser.deny_list = data
                        break
                    }
--- a/app_source/qml/components/KeysList.qml
+++ b/app_source/qml/components/KeysList.qml
@ -111,8 +111,13 @@ Item {
                text: qsTr("删除")
                enabled: list.has_selected
                onClicked: {
-                    let data = ZigBeeParser.pre_hmac_verify_key
-                    data.splice(list.current_index,1)
+                    let data = []
+                    for (let i = 0; i < ZigBeeParser.pre_hmac_verify_key.length; i++)
+                    {
+                        if (i === list.current_index)
+                            continue
+                        data.push(ZigBeeParser.pre_hmac_verify_key[i])
+                    }
                    ZigBeeParser.pre_hmac_verify_key = data
                }
            }
--- a/scripts/windows-mingw-publish.ps1
+++ b/scripts/windows-mingw-publish.ps1
@ -17,7 +17,7 @@ function Main() {

    New-Item -ItemType Directory $archiveName
    # 拷贝exe
-    Copy-Item D:\a\ProtocolParser\ProtocolParser\build\app\release\* $archiveName\ -Force -Recurse | Out-Null
+    Copy-Item D:\a\ProtocolParser\ProtocolParser\build\app_source\* $archiveName\ -Force -Recurse | Out-Null
    # 拷贝依赖
    windeployqt --qmldir . --plugindir $archiveName\plugins --no-translations --compiler-runtime $archiveName\$targetName
    # 删除不必要的文件
--- a/scripts/windows-publish.ps1
+++ b/scripts/windows-publish.ps1
@ -27,7 +27,7 @@ function Main() {

    New-Item -ItemType Directory $archiveName
    # 拷贝exe
-    Copy-Item D:\a\ProtocolParser\ProtocolParser\build\app\release\* $archiveName\ -Force -Recurse | Out-Null
+    Copy-Item D:\a\ProtocolParser\ProtocolParser\build\app_source\* $archiveName\ -Force -Recurse | Out-Null
    # 拷贝依赖
    windeployqt --qmldir . --plugindir $archiveName\plugins --no-translations --compiler-runtime $archiveName\$targetName
    # 删除不必要的文件