CMakeLists and Workflow: optimize runtime gemeration.

.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_source/${targetName}.app -qmldir=. -verbose=1 -dmg
+          sudo macdeployqt /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${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_source/${{ env.targetName }}.dmg
+          path: /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${{ 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_source/${{ env.targetName }}.dmg
+          file: /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${{ env.targetName }}.dmg
           asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_shared.dmg
           tag: ${{ github.ref }}
           overwrite: true

.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_source/${targetName}.app -qmldir=. -verbose=1 -dmg     
+          macdeployqt /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${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_source/${{ env.targetName }}.dmg
+          path: /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${{ 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_source/${{ env.targetName }}.dmg
+          file: /Users/runner/work/ProtocolParser/ProtocolParser/build/app/release/${{ env.targetName }}.dmg
           asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.dmg
           tag: ${{ github.ref }}
           overwrite: true

.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_source/${targetName} --appdir /home/runner/work/ProtocolParser/ProtocolParser/build/app_source/
+          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/
           mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}_${{ matrix.os }}_${{matrix.qt_ver}}_shared.AppImage
         
       - uses: actions/upload-artifact@v2

.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_source/${targetName} --appdir /home/runner/work/ProtocolParser/ProtocolParser/build/app_source/
+          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/
           mv ${{ env.targetName }}-*.AppImage ${{ env.targetName }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}_static.AppImage
         
       - uses: actions/upload-artifact@v2

3rdparty/RibbonUI

@@ -1 +1 @@
-Subproject commit bca8bafa5ee0dbe39b8f887fb4096ef39886aa92
+Subproject commit b56ab042b49e1ad72242d79153edc74fd4f3bc3c

app_source/CMakeLists.txt

@@ -31,6 +31,12 @@ 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}
@@ -48,7 +54,7 @@ if (WIN32)
     add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy
         ${DLL_FILES}
-        "${CMAKE_BINARY_DIR}${PATH_SEPARATOR}app_source"
+        ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
     )
 elseif(APPLE)
     set(MACOSX_BUNDLE_ICON_FILE AppIcon)

app_source/dlln3x/zigbeeframe.h

@@ -163,6 +163,8 @@ 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]);

app_source/qml/components/DeviceList.qml

@@ -143,12 +143,8 @@ Item{
                         {
                             deny.push(ZigBeeParser.wait_queue[list.current_index])
                             ZigBeeParser.deny_list = deny
-                            for (var i = 0; i < ZigBeeParser.wait_queue.length; i++)
+                            data = ZigBeeParser.wait_queue
-                            {
+                            data.splice(list.current_index,1)
-                                if (i === list.current_index)
-                                    continue
-                                data.push(ZigBeeParser.wait_queue[i])
-                            }
                             ZigBeeParser.wait_queue = data
                             break
                         }
@@ -156,12 +152,8 @@ Item{
                         {
                             deny.push(ZigBeeParser.allow_list[list.current_index])
                             ZigBeeParser.deny_list = deny
-                            for (let i = 0; i < ZigBeeParser.allow_list.length; i++)
+                            data = ZigBeeParser.allow_list
-                            {
+                            data.splice(list.current_index,1)
-                                if (i === list.current_index)
-                                    continue
-                                data.push(ZigBeeParser.allow_list[i])
-                            }
                             ZigBeeParser.allow_list = data
                             break
                         }
@@ -170,13 +162,8 @@ Item{
                             let allow = ZigBeeParser.allow_list
                             allow.push(ZigBeeParser.deny_list[list.current_index])
                             ZigBeeParser.allow_list = allow
-                            let data = []
+                            data = ZigBeeParser.deny_list
-                            for (let i = 0; i < ZigBeeParser.deny_list.length; i++)
+                            data.splice(list.current_index,1)
-                            {
-                                if (i === list.current_index)
-                                    continue
-                                data.push(ZigBeeParser.deny_list[i])
-                            }
                             ZigBeeParser.deny_list = data
                             break
                         }
@@ -196,37 +183,22 @@ Item{
                         let allow = ZigBeeParser.allow_list
                         allow.push(ZigBeeParser.wait_queue[list.current_index])
                         ZigBeeParser.allow_list = allow
-                        var data = []
+                        var data = ZigBeeParser.wait_queue
-                        for (var i = 0; i < ZigBeeParser.wait_queue.length; i++)
+                        data.splice(list.current_index,1)
-                        {
-                            if (i === list.current_index)
-                                continue
-                            data.push(ZigBeeParser.wait_queue[i])
-                        }
                         ZigBeeParser.wait_queue = data
                         break
                     }
                     case 1:
                     {
-                        let data = []
+                        let data = ZigBeeParser.allow_list
-                        for (let i = 0; i < ZigBeeParser.allow_list.length; i++)
+                        data.splice(list.current_index,1)
-                        {
-                            if (i === list.current_index)
-                                continue
-                            data.push(ZigBeeParser.allow_list[i])
-                        }
                         ZigBeeParser.allow_list = data
                         break
                     }
                     case 2:
                     {
-                        let data = []
+                        let data = ZigBeeParser.deny_list
-                        for (let i = 0; i < ZigBeeParser.deny_list.length; i++)
+                        data.splice(list.current_index,1)
-                        {
-                            if (i === list.current_index)
-                                continue
-                            data.push(ZigBeeParser.deny_list[i])
-                        }
                         ZigBeeParser.deny_list = data
                         break
                     }

app_source/qml/components/KeysList.qml

@@ -111,13 +111,8 @@ Item {
                 text: qsTr("删除")
                 enabled: list.has_selected
                 onClicked: {
-                    let data = []
+                    let data = ZigBeeParser.pre_hmac_verify_key
-                    for (let i = 0; i < ZigBeeParser.pre_hmac_verify_key.length; i++)
+                    data.splice(list.current_index,1)
-                    {
-                        if (i === list.current_index)
-                            continue
-                        data.push(ZigBeeParser.pre_hmac_verify_key[i])
-                    }
                     ZigBeeParser.pre_hmac_verify_key = data
                 }
             }

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_source\* $archiveName\ -Force -Recurse | Out-Null
+    Copy-Item D:\a\ProtocolParser\ProtocolParser\build\app\release\* $archiveName\ -Force -Recurse | Out-Null
     # 拷贝依赖
     windeployqt --qmldir . --plugindir $archiveName\plugins --no-translations --compiler-runtime $archiveName\$targetName
     # 删除不必要的文件

scripts/windows-publish.ps1

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