fix: debugger的波形显示修复

.gitignore

@@ -28,6 +28,7 @@ DebuggerCmd.md
 *.suo
 *.ntvs*
 *.njsproj
+*.sln
 *.sw?
 
 *.tsbuildinfo

FPGAWebLabServer.sln

@@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server", "server\server.csproj", "{F31D6A0D-0407-41CE-A67E-01B847488EFB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "server.test", "server.test\server.test.csproj", "{CC274582-AC3C-4FD1-977C-96F1BC2760BD}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|x64.Build.0 = Debug|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Debug|x86.Build.0 = Debug|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|x64.ActiveCfg = Release|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|x64.Build.0 = Release|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|x86.ActiveCfg = Release|Any CPU
-		{F31D6A0D-0407-41CE-A67E-01B847488EFB}.Release|x86.Build.0 = Release|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|x64.Build.0 = Debug|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Debug|x86.Build.0 = Debug|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|x64.ActiveCfg = Release|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|x64.Build.0 = Release|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|x86.ActiveCfg = Release|Any CPU
-		{CC274582-AC3C-4FD1-977C-96F1BC2760BD}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

flake.nix

@@ -39,10 +39,10 @@
             typescript-language-server
           ];
           shellHook = ''
-            export PATH=$PATH:/home/sikongjueluo/.dotnet/tools
+            export PATH=$PATH:
             export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${pkgs.zlib}/lib
-            export DOTNET_ROOT=${pkgs.dotnetCorePackages.sdk_9_0}/share/dotnet
           '';
+          
         };
       });
     };

package-lock.json

@@ -8,14 +8,11 @@
       "name": "fpga-weblab",
       "version": "0.1.0",
       "dependencies": {
-        "@microsoft/signalr": "^9.0.6",
         "@svgdotjs/svg.js": "^3.2.4",
         "@tanstack/vue-table": "^8.21.3",
         "@types/lodash": "^4.17.16",
-        "@types/signalr": "^2.4.3",
         "@vueuse/core": "^13.5.0",
         "async-mutex": "^0.5.0",
-        "axios": "^1.11.0",
         "echarts": "^5.6.0",
         "highlight.js": "^11.11.1",
         "konva": "^9.3.20",
@@ -1130,39 +1127,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@microsoft/signalr": {
-      "version": "9.0.6",
-      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-9.0.6.tgz",
-      "integrity": "sha512-DrhgzFWI9JE4RPTsHYRxh4yr+OhnwKz8bnJe7eIi7mLLjqhJpEb62CiUy/YbFvLqLzcGzlzz1QWgVAW0zyipMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "abort-controller": "^3.0.0",
-        "eventsource": "^2.0.2",
-        "fetch-cookie": "^2.0.3",
-        "node-fetch": "^2.6.7",
-        "ws": "^7.5.10"
-      }
-    },
-    "node_modules/@microsoft/signalr/node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "license": "MIT",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/@polka/url": {
       "version": "1.0.0-next.29",
       "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.29.tgz",
@@ -1880,15 +1844,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/jquery": {
-      "version": "3.5.32",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.32.tgz",
-      "integrity": "sha512-b9Xbf4CkMqS02YH8zACqN1xzdxc3cO735Qe5AbSUFmyOiaWAbcpqh9Wna+Uk0vgACvoQHpWDg2rGdHkYPLmCiQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/sizzle": "*"
-      }
-    },
     "node_modules/@types/lodash": {
       "version": "4.17.16",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.16.tgz",
@@ -1905,21 +1860,6 @@
         "undici-types": "~6.21.0"
       }
     },
-    "node_modules/@types/signalr": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/@types/signalr/-/signalr-2.4.3.tgz",
-      "integrity": "sha512-W6C1wMRIIhJV9nsw19yhw4h9zlkLnJzsu9dYlH35aHUQblPsDF6UpCcAVu4Ljy4RS3c3uJyV88wf2M2SOWqqZg==",
-      "license": "MIT",
-      "dependencies": {
-        "@types/jquery": "*"
-      }
-    },
-    "node_modules/@types/sizzle": {
-      "version": "2.3.9",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
-      "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==",
-      "license": "MIT"
-    },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.21",
       "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
@@ -2316,18 +2256,6 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
-    "node_modules/abort-controller": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
-      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
-      "license": "MIT",
-      "dependencies": {
-        "event-target-shim": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=6.5"
-      }
-    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
@@ -2429,12 +2357,6 @@
         "tslib": "^2.4.0"
       }
     },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "license": "MIT"
-    },
     "node_modules/autoprefixer": {
       "version": "10.4.21",
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.21.tgz",
@@ -2473,17 +2395,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/axios": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz",
-      "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==",
-      "license": "MIT",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.4",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -2585,19 +2496,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001715",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz",
@@ -2644,18 +2542,6 @@
         "fsevents": "~2.3.2"
       }
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "license": "MIT",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/complex.js": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.4.2.tgz",
@@ -2849,15 +2735,6 @@
       "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==",
       "license": "MIT"
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/detect-libc": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
@@ -2878,20 +2755,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/echarts": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.6.0.tgz",
@@ -2951,51 +2814,6 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/esbuild": {
       "version": "0.25.2",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz",
@@ -3059,24 +2877,6 @@
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "license": "MIT"
     },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eventsource": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
-      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
     "node_modules/execa": {
       "version": "9.5.2",
       "resolved": "https://registry.npmjs.org/execa/-/execa-9.5.2.tgz",
@@ -3150,16 +2950,6 @@
         "node": "^12.20 || >= 14.13"
       }
     },
-    "node_modules/fetch-cookie": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-2.2.0.tgz",
-      "integrity": "sha512-h9AgfjURuCgA2+2ISl8GbavpUdR+WGAM2McW/ovn4tVccegp8ZqCKWSBR8uRdM8dDNlx5WdKRWxBYUwteLDCNQ==",
-      "license": "Unlicense",
-      "dependencies": {
-        "set-cookie-parser": "^2.4.8",
-        "tough-cookie": "^4.0.0"
-      }
-    },
     "node_modules/figures": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz",
@@ -3189,42 +2979,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/formdata-polyfill": {
       "version": "4.0.10",
       "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
@@ -3282,15 +3036,6 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -3301,43 +3046,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/get-stream": {
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz",
@@ -3391,18 +3099,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
@@ -3410,45 +3106,6 @@
       "dev": true,
       "license": "ISC"
     },
-    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -4066,15 +3723,6 @@
         "node": ">= 18"
       }
     },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/mathjs": {
       "version": "14.4.0",
       "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-14.4.0.tgz",
@@ -4120,27 +3768,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@@ -4568,33 +4195,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
-    },
-    "node_modules/psl": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
-      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
-      "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.3.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/lupomontero"
-      }
-    },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/quansync": {
       "version": "0.2.10",
       "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.10.tgz",
@@ -4612,12 +4212,6 @@
       ],
       "license": "MIT"
     },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-      "license": "MIT"
-    },
     "node_modules/read-package-json-fast": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz",
@@ -4703,12 +4297,6 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
-    "node_modules/requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-      "license": "MIT"
-    },
     "node_modules/resolve-pkg-maps": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
@@ -4794,12 +4382,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/set-cookie-parser": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
-      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
-      "license": "MIT"
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -4970,36 +4552,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/tough-cookie": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
-      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "psl": "^1.1.33",
-        "punycode": "^2.1.1",
-        "universalify": "^0.2.0",
-        "url-parse": "^1.5.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/tough-cookie/node_modules/universalify": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "license": "MIT"
-    },
     "node_modules/ts-log": {
       "version": "2.2.7",
       "resolved": "https://registry.npmjs.org/ts-log/-/ts-log-2.2.7.tgz",
@@ -5241,16 +4793,6 @@
         "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/url-parse": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-      "license": "MIT",
-      "dependencies": {
-        "querystringify": "^2.1.1",
-        "requires-port": "^1.0.0"
-      }
-    },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
@@ -5570,12 +5112,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "license": "BSD-2-Clause"
-    },
     "node_modules/webpack-virtual-modules": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
@@ -5583,16 +5119,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
     "node_modules/which": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz",
@@ -5609,27 +5135,6 @@
         "node": "^18.17.0 || >=20.5.0"
       }
     },
-    "node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
     "node_modules/yallist": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",

package.json

@@ -12,14 +12,11 @@
     "gen-api": "npx tsx scripts/GenerateWebAPI.ts"
   },
   "dependencies": {
-    "@microsoft/signalr": "^9.0.6",
     "@svgdotjs/svg.js": "^3.2.4",
     "@tanstack/vue-table": "^8.21.3",
     "@types/lodash": "^4.17.16",
-    "@types/signalr": "^2.4.3",
     "@vueuse/core": "^13.5.0",
     "async-mutex": "^0.5.0",
-    "axios": "^1.11.0",
     "echarts": "^5.6.0",
     "highlight.js": "^11.11.1",
     "konva": "^9.3.20",

scripts/GenerateWebAPI.ts

@@ -1,42 +1,36 @@
-import { spawn, exec, ChildProcess } from "child_process";
+import { spawn, exec, ChildProcess } from 'child_process';
-import { promisify } from "util";
+import { promisify } from 'util';
-import fetch from "node-fetch";
+import fetch from 'node-fetch';
-import * as fs from "fs";
+import * as fs from 'fs';
 
 const execAsync = promisify(exec);
 
 // Windows 支持函数
 function getCommand(command: string): string {
   // dotnet 在 Windows 上不需要 .cmd 后缀
-  if (command === "dotnet") {
+  if (command === 'dotnet') {
-    return "dotnet";
+    return 'dotnet';
   }
-  return process.platform === "win32" ? `${command}.cmd` : command;
+  return process.platform === 'win32' ? `${command}.cmd` : command;
 }
 
 function getSpawnOptions() {
-  return process.platform === "win32"
+  return process.platform === 'win32' ? { stdio: 'pipe', shell: true } : { stdio: 'pipe' };
-    ? { stdio: "pipe", shell: true }
-    : { stdio: "pipe" };
 }
 
-async function waitForServer(
+async function waitForServer(url: string, maxRetries: number = 30, interval: number = 1000): Promise<boolean> {
-  url: string,
-  maxRetries: number = 30,
-  interval: number = 1000,
-): Promise<boolean> {
   for (let i = 0; i < maxRetries; i++) {
     try {
       const response = await fetch(url);
       if (response.ok) {
-        console.log("✓ Server is ready");
+        console.log('✓ Server is ready');
         return true;
       }
     } catch (error) {
       // Server not ready yet
     }
     console.log(`Waiting for server... (${i + 1}/${maxRetries})`);
-    await new Promise((resolve) => setTimeout(resolve, interval));
+    await new Promise(resolve => setTimeout(resolve, interval));
   }
   return false;
 }
@@ -46,39 +40,32 @@ let serverProcess: ChildProcess | null = null;
 let webProcess: ChildProcess | null = null;
 
 async function startWeb(): Promise<ChildProcess> {
-  console.log("Starting Vite frontend...");
+  console.log('Starting Vite frontend...');
   return new Promise((resolve, reject) => {
-    const process = spawn(
+    const process = spawn(getCommand('npm'), ['run', 'dev'], getSpawnOptions() as any);
-      getCommand("npm"),
-      ["run", "dev"],
-      getSpawnOptions() as any,
-    );
 
     let webStarted = false;
 
-    process.stdout?.on("data", (data) => {
+    process.stdout?.on('data', (data) => {
       const output = data.toString();
       console.log(`Web: ${output}`);
       
       // 检查 Vite 是否已启动
-      if (
+      if ((output.includes('Local:') || output.includes('ready in')) && !webStarted) {
-        (output.includes("Local:") || output.includes("ready in")) &&
-        !webStarted
-      ) {
         webStarted = true;
         resolve(process);
       }
     });
 
-    process.stderr?.on("data", (data) => {
+    process.stderr?.on('data', (data) => {
       console.error(`Web Error: ${data}`);
     });
 
-    process.on("error", (error) => {
+    process.on('error', (error) => {
       reject(error);
     });
 
-    process.on("exit", (code, signal) => {
+    process.on('exit', (code, signal) => {
       console.log(`Web process exited with code ${code} and signal ${signal}`);
       if (!webStarted) {
         reject(new Error(`Web process exited unexpectedly with code ${code}`));
@@ -91,53 +78,45 @@ async function startWeb(): Promise<ChildProcess> {
     // 超时处理
     setTimeout(() => {
       if (!webStarted) {
-        reject(new Error("Web server failed to start within timeout"));
+        reject(new Error('Web server failed to start within timeout'));
       }
-    }, 10000); // 10秒超时
+    }, 30000); // 30秒超时
   });
 }
 
 async function startServer(): Promise<ChildProcess> {
-  console.log("Starting .NET server...");
+  console.log('Starting .NET server...');
   return new Promise((resolve, reject) => {
-    const process = spawn(
+    const process = spawn(getCommand('dotnet'), ['run', '--property:Configuration=Release'], {
-      getCommand("dotnet"),
+      cwd: 'server',
-      ["run", "--property:Configuration=Release"],
+      ...getSpawnOptions()
-      {
+    } as any);
-        cwd: "server",
-        ...getSpawnOptions(),
-      } as any,
-    );
 
     let serverStarted = false;
 
-    process.stdout?.on("data", (data) => {
+    process.stdout?.on('data', (data) => {
       const output = data.toString();
       console.log(`Server: ${output}`);
       
       // 检查服务器是否已启动
-      if (output.includes("Now listening on:") && !serverStarted) {
+      if (output.includes('Now listening on:') && !serverStarted) {
         serverStarted = true;
         resolve(process);
       }
     });
 
-    process.stderr?.on("data", (data) => {
+    process.stderr?.on('data', (data) => {
       console.error(`Server Error: ${data}`);
     });
 
-    process.on("error", (error) => {
+    process.on('error', (error) => {
       reject(error);
     });
 
-    process.on("exit", (code, signal) => {
+    process.on('exit', (code, signal) => {
-      console.log(
+      console.log(`Server process exited with code ${code} and signal ${signal}`);
-        `Server process exited with code ${code} and signal ${signal}`,
-      );
       if (!serverStarted) {
-        reject(
+        reject(new Error(`Server process exited unexpectedly with code ${code}`));
-          new Error(`Server process exited unexpectedly with code ${code}`),
-        );
       }
     });
 
@@ -147,53 +126,62 @@ async function startServer(): Promise<ChildProcess> {
     // 超时处理
     setTimeout(() => {
       if (!serverStarted) {
-        reject(new Error("Server failed to start within timeout"));
+        reject(new Error('Server failed to start within timeout'));
       }
-    }, 10000); // 10秒超时
+    }, 30000); // 30秒超时
   });
 }
 
 async function stopServer(): Promise<void> {
-  console.log("Stopping server...");
+  console.log('Stopping server...');
   
   if (!serverProcess) {
-    console.log("No server process to stop");
+    console.log('No server process to stop');
     return;
   }
 
   try {
     // 检查进程是否还存在
     if (serverProcess.killed || serverProcess.exitCode !== null) {
-      console.log("✓ Server process already terminated");
+      console.log('✓ Server process already terminated');
       serverProcess = null;
       return;
     }
 
     // 发送 SIGTERM 信号
-    const killed = serverProcess.kill("SIGTERM");
+    const killed = serverProcess.kill('SIGTERM');
     if (!killed) {
-      console.warn("Failed to send SIGTERM to server process");
+      console.warn('Failed to send SIGTERM to server process');
       return;
     }
 
+    // 等待进程优雅退出
+    const exitPromise = new Promise<void>((resolve) => {
+      if (serverProcess) {
+        serverProcess.on('exit', () => {
+          console.log('✓ Server stopped gracefully');
+          resolve();
+        });
+      } else {
+        resolve();
+      }
+    });
+
     // 设置超时，如果 3 秒内没有退出则强制终止
     const timeoutPromise = new Promise<void>((resolve) => {
       setTimeout(() => {
-        if (
+        if (serverProcess && !serverProcess.killed && serverProcess.exitCode === null) {
-          serverProcess &&
+          console.log('Force killing server process...');
-          !serverProcess.killed &&
+          serverProcess.kill('SIGKILL');
-          serverProcess.exitCode === null
-        ) {
-          console.log("Force killing server process...");
-          serverProcess.kill("SIGKILL");
         }
         resolve();
       }, 3000); // 减少超时时间到3秒
     });
 
-    await Promise.race([timeoutPromise]);
+    await Promise.race([exitPromise, timeoutPromise]);
+    
   } catch (error) {
-    console.warn("Warning: Could not stop server process:", error);
+    console.warn('Warning: Could not stop server process:', error);
   } finally {
     serverProcess = null;
     
@@ -203,51 +191,67 @@ async function stopServer(): Promise<void> {
 }
 
 async function stopWeb(): Promise<void> {
-  console.log("Stopping web server...");
+  console.log('Stopping web server...');
   
   if (!webProcess) {
-    console.log("No web process to stop");
+    console.log('No web process to stop');
     return;
   }
 
   try {
     // 检查进程是否还存在
     if (webProcess.killed || webProcess.exitCode !== null) {
-      console.log("✓ Web process already terminated");
+      console.log('✓ Web process already terminated');
       webProcess = null;
       return;
     }
 
     // 发送 SIGTERM 信号
-    const killed = webProcess.kill("SIGTERM");
+    const killed = webProcess.kill('SIGTERM');
     if (!killed) {
-      console.warn("Failed to send SIGTERM to web process");
+      console.warn('Failed to send SIGTERM to web process');
       return;
     }
 
+    // 等待进程优雅退出
+    const exitPromise = new Promise<void>((resolve) => {
+      if (webProcess) {
+        webProcess.on('exit', () => {
+          console.log('✓ Web server stopped gracefully');
+          resolve();
+        });
+      } else {
+        resolve();
+      }
+    });
+
     // 设置超时，如果 3 秒内没有退出则强制终止
     const timeoutPromise = new Promise<void>((resolve) => {
       setTimeout(() => {
         if (webProcess && !webProcess.killed && webProcess.exitCode === null) {
-          console.log("Force killing web process...");
+          console.log('Force killing web process...');
-          webProcess.kill("SIGKILL");
+          webProcess.kill('SIGKILL');
         }
         resolve();
-      }, 3000);
+      }, 3000); // 减少超时时间到3秒
     });
 
-    await Promise.race([timeoutPromise]);
+    await Promise.race([exitPromise, timeoutPromise]);
+    
   } catch (error) {
-    console.warn("Warning: Could not stop web process:", error);
+    console.warn('Warning: Could not stop web process:', error);
   } finally {
     webProcess = null;
+    
+    // 只有在进程可能没有正常退出时才执行清理
+    // 移除自动清理逻辑，因为正常退出时不需要
   }
 }
 
 async function postProcessApiClient(): Promise<void> {
-  console.log("Post-processing API client...");
+  console.log('Post-processing API client...');
   try {
-    const filePath = "src/APIClient.ts";
+    const filePath = 'src/APIClient.ts';
     
     // 检查文件是否存在
     if (!fs.existsSync(filePath)) {
@@ -255,43 +259,29 @@ async function postProcessApiClient(): Promise<void> {
     }
     
     // 读取文件内容
-    let content = fs.readFileSync(filePath, "utf8");
+    let content = fs.readFileSync(filePath, 'utf8');
     
     // 替换 ArgumentException 中的 message 属性声明
     content = content.replace(
       /(\s+)message!:\s*string;/g,
-      "$1declare message: string;",
+      '$1declare message: string;'
-    );
-    content = content.replace(
-      "{ AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, CancelToken }",
-      "{ AxiosError, type AxiosInstance, type AxiosRequestConfig, type AxiosResponse, type CancelToken }",
     );
     
     // 写回文件
-    fs.writeFileSync(filePath, content, "utf8");
+    fs.writeFileSync(filePath, content, 'utf8');
     
-    console.log("✓ API client post-processing completed");
+    console.log('✓ API client post-processing completed');
   } catch (error) {
     throw new Error(`Failed to post-process API client: ${error}`);
   }
 }
 
 async function generateApiClient(): Promise<void> {
-  console.log("Generating API client...");
+  console.log('Generating API client...');
   try {
-    const url = "http://127.0.0.1:5000/GetAPIClientCode";
+    const npxCommand = getCommand('npx');
-    const response = await fetch(url);
+    await execAsync(`${npxCommand} nswag openapi2tsclient /input:http://localhost:5000/swagger/v1/swagger.json /output:src/APIClient.ts`);
-    if (!response.ok) {
+    console.log('✓ API client generated successfully');
-      throw new Error(
-        `Failed to fetch API client code: ${response.status} ${response.statusText}`,
-      );
-    }
-    const code = await response.text();
-
-    // 写入 APIClient.ts
-    const filePath = "src/APIClient.ts";
-    fs.writeFileSync(filePath, code, "utf8");
-    console.log("✓ API client code fetched and written successfully");
     
     // 添加后处理步骤
     await postProcessApiClient();
@@ -300,55 +290,35 @@ async function generateApiClient(): Promise<void> {
   }
 }
 
-async function generateSignalRClient(): Promise<void> {
-  console.log("Generating SignalR TypeScript client...");
-  try {
-    const { stdout, stderr } = await execAsync(
-      "dotnet tsrts --project ./server/server.csproj --output ./src/",
-    );
-    if (stdout) console.log(stdout);
-    if (stderr) console.error(stderr);
-    console.log("✓ SignalR TypeScript client generated successfully");
-  } catch (error) {
-    throw new Error(`Failed to generate SignalR client: ${error}`);
-  }
-}
-
 async function main(): Promise<void> {
   try {
-    // Generate SignalR client
-    await generateSignalRClient();
-    console.log("✓ SignalR TypeScript client generated successfully");
-
     // Start web frontend first
     await startWeb();
-    console.log("✓ Frontend started");
+    console.log('✓ Frontend started');
     
     // Wait a bit for frontend to fully initialize
-    await new Promise((resolve) => setTimeout(resolve, 3000));
+    await new Promise(resolve => setTimeout(resolve, 3000));
     
     // Start server
     await startServer();
-    console.log("✓ Backend started");
+    console.log('✓ Backend started');
     
     // Wait for server to be ready (给服务器额外时间完全启动)
-    await new Promise((resolve) => setTimeout(resolve, 2000));
+    await new Promise(resolve => setTimeout(resolve, 2000));
     
     // Check if swagger endpoint is available
-    const serverReady = await waitForServer(
+    const serverReady = await waitForServer('http://localhost:5000/swagger/v1/swagger.json');
-      "http://localhost:5000/swagger/v1/swagger.json",
-    );
     
     if (!serverReady) {
-      throw new Error("Server failed to start within the expected time");
+      throw new Error('Server failed to start within the expected time');
     }
     
     // Generate API client
     await generateApiClient();
     
-    console.log("✓ API generation completed successfully");
+    console.log('✓ API generation completed successfully');
   } catch (error) {
-    console.error("❌ Error:", error);
+    console.error('❌ Error:', error);
     process.exit(1);
   } finally {
     // Always try to stop processes in order: server first, then web
@@ -362,7 +332,7 @@ let isCleaningUp = false;
 
 const cleanup = async (signal: string) => {
   if (isCleaningUp) {
-    console.log("Cleanup already in progress, ignoring signal");
+    console.log('Cleanup already in progress, ignoring signal');
     return;
   }
   
@@ -370,44 +340,53 @@ const cleanup = async (signal: string) => {
   console.log(`\nReceived ${signal}, cleaning up...`);
   
   try {
-    await Promise.all([stopServer(), stopWeb()]);
+    await Promise.all([
+      stopServer(),
+      stopWeb()
+    ]);
   } catch (error) {
-    console.error("Error during cleanup:", error);
+    console.error('Error during cleanup:', error);
   }
   
   // 立即退出，不等待
   process.exit(0);
 };
 
-process.on("SIGINT", () => cleanup("SIGINT"));
+process.on('SIGINT', () => cleanup('SIGINT'));
-process.on("SIGTERM", () => cleanup("SIGTERM"));
+process.on('SIGTERM', () => cleanup('SIGTERM'));
 
 // 处理未捕获的异常
-process.on("uncaughtException", async (error) => {
+process.on('uncaughtException', async (error) => {
   if (isCleaningUp) return;
   
-  console.error("❌ Uncaught exception:", error);
+  console.error('❌ Uncaught exception:', error);
   isCleaningUp = true;
   
   try {
-    await Promise.all([stopServer(), stopWeb()]);
+    await Promise.all([
+      stopServer(),
+      stopWeb()
+    ]);
   } catch (cleanupError) {
-    console.error("Error during cleanup:", cleanupError);
+    console.error('Error during cleanup:', cleanupError);
   }
   
   process.exit(1);
 });
 
-process.on("unhandledRejection", async (reason, promise) => {
+process.on('unhandledRejection', async (reason, promise) => {
   if (isCleaningUp) return;
   
-  console.error("❌ Unhandled rejection at:", promise, "reason:", reason);
+  console.error('❌ Unhandled rejection at:', promise, 'reason:', reason);
   isCleaningUp = true;
   
   try {
-    await Promise.all([stopServer(), stopWeb()]);
+    await Promise.all([
+      stopServer(),
+      stopWeb()
+    ]);
   } catch (cleanupError) {
-    console.error("Error during cleanup:", cleanupError);
+    console.error('Error during cleanup:', cleanupError);
   }
   
   process.exit(1);
@@ -416,13 +395,16 @@ process.on("unhandledRejection", async (reason, promise) => {
 main().catch(async (error) => {
   if (isCleaningUp) return;
   
-  console.error("❌ Unhandled error:", error);
+  console.error('❌ Unhandled error:', error);
   isCleaningUp = true;
   
   try {
-    await Promise.all([stopServer(), stopWeb()]);
+    await Promise.all([
+      stopServer(),
+      stopWeb()
+    ]);
   } catch (cleanupError) {
-    console.error("Error during cleanup:", cleanupError);
+    console.error('Error during cleanup:', cleanupError);
   }
   
   process.exit(1);

server.test/CommonTest.cs

@@ -0,0 +1,61 @@
+using System.Buffers.Binary;
+using Common;
+
+namespace server.test;
+
+public class CommonTest
+{
+    [Fact]
+    public void ReverseBytesTest()
+    {
+        var rnd = new Random();
+        var bytesLen = 8;
+        var bytesArray = new byte[bytesLen];
+        rnd.NextBytes(bytesArray);
+
+        var rev2Bytes = new byte[] {
+            bytesArray[1],
+            bytesArray[0],
+            bytesArray[3],
+            bytesArray[2],
+            bytesArray[5],
+            bytesArray[4],
+            bytesArray[7],
+            bytesArray[6],
+        };
+        Assert.Equal(Number.ReverseBytes(bytesArray, 2).Value, rev2Bytes);
+
+        var rev4Bytes = new byte[] {
+            bytesArray[3],
+            bytesArray[2],
+            bytesArray[1],
+            bytesArray[0],
+            bytesArray[7],
+            bytesArray[6],
+            bytesArray[5],
+            bytesArray[4],
+        };
+        Assert.Equal(Number.ReverseBytes(bytesArray, 4).Value, rev4Bytes);
+    }
+
+    [Fact]
+    public void ToBitTest()
+    {
+        Assert.Equal(true, Number.ToBit(0xFF, 3).Value);
+        Assert.Equal(false, Number.ToBit(0x00, 3).Value);
+        Assert.Equal(true, Number.ToBit(0xAA, 3).Value);
+        Assert.Equal(false, Number.ToBit(0xAA, 2).Value);
+    }
+
+    [Fact]
+    public void ReverseBits()
+    {
+        Assert.Equal((byte)0x05, Common.Number.ReverseBits((byte)0xA0));
+
+        var bytesSrc = new byte[] { 0xAB, 0x00, 0x00, 0x01 };
+        var bytes = new byte[4];
+        for (int i = 0; i < 4; i++)
+            bytes[i] = Common.Number.ReverseBits(bytesSrc[i]);
+        Assert.Equal(new byte[] { 0xD5, 0x00, 0x00, 0x80 }, bytes);
+    }
+}

server.test/NumberTest.cs

@@ -1,310 +0,0 @@
-using System.Collections;
-using Common;
-
-namespace CommonTest;
-
-/// <summary>
-/// 针对 Common.Number 的单元测试，覆盖所有公开方法
-/// </summary>
-public class NumberTest
-{
-    /// <summary>
-    /// 测试 NumberToBytes 的正常与异常情况
-    /// </summary>
-    [Fact]
-    public void Test_NumberToBytes()
-    {
-        // 测试大端（isLowNumHigh=false）
-        var result1 = Number.NumberToBytes(0x12345678ABCDEF01, 8, false);
-        Assert.True(result1.IsSuccessful);
-        Assert.Equal(new byte[] { 0x12, 0x34, 0x56, 0x78, 0xAB, 0xCD, 0xEF, 0x01 }, result1.Value);
-
-        // 测试小端（isLowNumHigh=true）
-        var result2 = Number.NumberToBytes(0x12345678ABCDEF01, 8, true);
-        Assert.True(result2.IsSuccessful);
-        Assert.Equal(new byte[] { 0x01, 0xEF, 0xCD, 0xAB, 0x78, 0x56, 0x34, 0x12 }, result2.Value);
-
-        // 测试长度不足（4字节）
-        var result3 = Number.NumberToBytes(0x12345678, 4, false);
-        Assert.True(result3.IsSuccessful);
-        Assert.Equal(new byte[] { 0x12, 0x34, 0x56, 0x78 }, result3.Value);
-
-        // 测试超长
-        var result4 = Number.NumberToBytes(0x1, 9, false);
-        Assert.False(result4.IsSuccessful);
-    }
-
-    /// <summary>
-    /// 测试 BytesToUInt64 的正常与异常情况
-    /// </summary>
-    [Fact]
-    public void Test_BytesToUInt64()
-    {
-        // 正常大端
-        var bytes = new byte[] { 0x12, 0x34, 0x56, 0x78, 0xAB, 0xCD, 0xEF, 0x01 };
-        var result = Number.BytesToUInt64((byte[])bytes.Clone(), false);
-        Assert.True(result.IsSuccessful);
-        Assert.Equal(0x12345678ABCDEF01UL, result.Value);
-
-        // 正常小端
-        var bytes2 = new byte[] { 0x01, 0xEF, 0xCD, 0xAB, 0x78, 0x56, 0x34, 0x12 };
-        var result2 = Number.BytesToUInt64((byte[])bytes2.Clone(), true);
-        Assert.True(result2.IsSuccessful);
-        Assert.Equal(0x12345678ABCDEF01UL, result2.Value);
-
-        // 异常：长度超限
-        var result3 = Number.BytesToUInt64(new byte[9], false);
-        Assert.False(result3.IsSuccessful);
-
-        // 异常：不足8字节
-        var result4 = Number.BytesToUInt64(new byte[] { 0x01, 0x02 }, false);
-        Assert.False(result4.IsSuccessful); // BitConverter.ToUInt64 需要8字节
-    }
-
-    /// <summary>
-    /// 测试 BytesToUInt32 的正常与异常情况
-    /// </summary>
-    [Fact]
-    public void Test_BytesToUInt32()
-    {
-        // 正常大端
-        var bytes = new byte[] { 0x12, 0x34, 0x56, 0x78 };
-        var result = Number.BytesToUInt32((byte[])bytes.Clone(), false);
-        Assert.True(result.IsSuccessful);
-        Assert.Equal(0x12345678U, result.Value);
-
-        // 正常小端
-        var bytes2 = new byte[] { 0x78, 0x56, 0x34, 0x12 };
-        var result2 = Number.BytesToUInt32((byte[])bytes2.Clone(), true);
-        Assert.True(result2.IsSuccessful);
-        Assert.Equal(0x12345678U, result2.Value);
-
-        // 异常：长度超限
-        var result3 = Number.BytesToUInt32(new byte[5], false);
-        Assert.False(result3.IsSuccessful);
-
-        // 异常：不足4字节
-        var result4 = Number.BytesToUInt32(new byte[] { 0x01, 0x02 }, false);
-        Assert.False(result4.IsSuccessful); // BitConverter.ToUInt32 需要4字节
-    }
-
-    /// <summary>
-    /// 测试 UInt32ArrayToBytes 的正常与异常情况
-    /// </summary>
-    [Fact]
-    public void Test_UInt32ArrayToBytes()
-    {
-        // 正常情况
-        var arr = new UInt32[] { 0x12345678, 0xABCDEF01 };
-        var result = Number.UInt32ArrayToBytes(arr);
-        Assert.True(result.IsSuccessful);
-        // BlockCopy 按小端序
-        Assert.Equal(new byte[] { 0x78, 0x56, 0x34, 0x12, 0x01, 0xEF, 0xCD, 0xAB }, result.Value);
-
-        // 空数组
-        var result2 = Number.UInt32ArrayToBytes(new UInt32[0]);
-        Assert.True(result2.IsSuccessful);
-        Assert.Empty(result2.Value);
-    }
-
-    /// <summary>
-    /// 测试 MultiBitsToBytes 和 MultiBitsToNumber (ulong)
-    /// </summary>
-    [Fact]
-    public void Test_MultiBitsToBytesAndNumber_Ulong()
-    {
-        // 合并两个比特段
-        var result = Number.MultiBitsToNumber(0b101UL, 3, 0b11UL, 2);
-        Assert.True(result.IsSuccessful);
-        Assert.Equal((ulong)0b10111, result.Value);
-
-        // 合并为字节数组
-        var bytesResult = Number.MultiBitsToBytes(0b101UL, 3, 0b11UL, 2);
-        Assert.True(bytesResult.IsSuccessful);
-        Assert.Equal(new byte[] { 0b10111 }, bytesResult.Value);
-
-        // 超过64位
-        var failResult = Number.MultiBitsToNumber(0xFFFFFFFFFFFFFFFF, 64, 1, 1);
-        Assert.False(failResult.IsSuccessful);
-    }
-
-    /// <summary>
-    /// 测试 MultiBitsToNumber (uint)
-    /// </summary>
-    [Fact]
-    public void Test_MultiBitsToNumber_Uint()
-    {
-        var result = Number.MultiBitsToNumber(0b101U, 3, 0b11U, 2);
-        Assert.True(result.IsSuccessful);
-        Assert.Equal((uint)0b10111, result.Value);
-
-        // 超过64位
-        var failResult = Number.MultiBitsToNumber(uint.MaxValue, 64, 1, 1);
-        Assert.False(failResult.IsSuccessful);
-    }
-
-    /// <summary>
-    /// 测试 BitsCheck (ulong)
-    /// </summary>
-    [Fact]
-    public void Test_BitsCheck_Ulong()
-    {
-        // 完全匹配
-        Assert.True(Number.BitsCheck(0b1101UL, 0b1101UL));
-        // 不匹配
-        Assert.False(Number.BitsCheck(0b1101UL, 0b1001UL));
-        // 掩码
-        Assert.True(Number.BitsCheck(0b1101UL, 0b1001UL, 0b1001UL));
-    }
-
-    /// <summary>
-    /// 测试 BitsCheck (uint)
-    /// </summary>
-    [Fact]
-    public void Test_BitsCheck_Uint()
-    {
-        Assert.True(Number.BitsCheck(0b1011U, 0b1011U));
-        Assert.False(Number.BitsCheck(0b1011U, 0b1001U));
-        Assert.True(Number.BitsCheck(0b1011U, 0b1001U, 0b1001U));
-    }
-
-    /// <summary>
-    /// 测试 ToBit
-    /// </summary>
-    [Fact]
-    public void Test_ToBit()
-    {
-        // 取第0位
-        var result = Number.ToBit(0b1010U, 0);
-        Assert.True(result.IsSuccessful);
-        Assert.False(result.Value);
-
-        // 取第1位
-        var result2 = Number.ToBit(0b1010U, 1);
-        Assert.True(result2.IsSuccessful);
-        Assert.True(result2.Value);
-
-        // 负数位置
-        var result3 = Number.ToBit(0b1010U, -1);
-        Assert.False(result3.IsSuccessful);
-    }
-
-    /// <summary>
-    /// 测试 BitsToNumber
-    /// </summary>
-    [Fact]
-    public void Test_BitsToNumber()
-    {
-        // 5位BitArray
-        var bits = new BitArray(new bool[] { true, true, false, true, false }); // 0b01011
-        var result = Number.BitsToNumber(bits);
-        Assert.True(result.IsSuccessful);
-        Assert.Equal((uint)0b01011, result.Value);
-
-        // 超过32位
-        var bits2 = new BitArray(33);
-        Assert.Throws<ArgumentException>(() => Number.BitsToNumber(bits2));
-    }
-
-    /// <summary>
-    /// 测试 StringToBytes
-    /// </summary>
-    [Fact]
-    public void Test_StringToBytes()
-    {
-        // 16进制字符串
-        var bytes = Number.StringToBytes("1234ABCD");
-        Assert.Equal(new byte[] { 0x12, 0x34, 0xAB, 0xCD }, bytes);
-
-        // 8位字符串
-        var bytes2 = Number.StringToBytes("01020304");
-        Assert.Equal(new byte[] { 0x01, 0x02, 0x03, 0x04 }, bytes2);
-    }
-
-    /// <summary>
-    /// 测试 ReverseBytes
-    /// </summary>
-    [Fact]
-    public void Test_ReverseBytes()
-    {
-        // 步长为2
-        var src = new byte[] { 0x01, 0x02, 0x03, 0x04 };
-        var result = Number.ReverseBytes(src, 2);
-        Assert.True(result.IsSuccessful);
-        Assert.Equal(new byte[] { 0x02, 0x01, 0x04, 0x03 }, result.Value);
-
-        // 步长为4
-        var src2 = new byte[] { 0x01, 0x02, 0x03, 0x04 };
-        var result2 = Number.ReverseBytes(src2, 4);
-        Assert.True(result2.IsSuccessful);
-        Assert.Equal(new byte[] { 0x04, 0x03, 0x02, 0x01 }, result2.Value);
-
-        // 步长为1（无变化）
-        var src3 = new byte[] { 0x01, 0x02, 0x03, 0x04 };
-        var result3 = Number.ReverseBytes(src3, 1);
-        Assert.True(result3.IsSuccessful);
-        Assert.Equal(src3, result3.Value);
-
-        // 步长为0（异常）
-        var result4 = Number.ReverseBytes(src3, 0);
-        Assert.False(result4.IsSuccessful);
-
-        // 步长不能整除
-        var result5 = Number.ReverseBytes(src3, 3);
-        Assert.False(result5.IsSuccessful);
-    }
-
-    /// <summary>
-    /// 测试 ReverseBits (byte)
-    /// </summary>
-    [Fact]
-    public void Test_ReverseBits_Byte()
-    {
-        // 0b00010010 -> 0b01001000
-        byte src = 0b00010010;
-        byte reversed = Number.ReverseBits(src);
-        Assert.Equal(0b01001000, reversed);
-
-        // 0b11110000 -> 0b00001111
-        Assert.Equal(0b00001111, Number.ReverseBits(0b11110000));
-    }
-
-    /// <summary>
-    /// 测试 ReverseBits (byte[])
-    /// </summary>
-    [Fact]
-    public void Test_ReverseBits_ByteArray()
-    {
-        var src = new byte[] { 0b00010010, 0b11110000 };
-        var reversed = Number.ReverseBits(src);
-        Assert.Equal(new byte[] { 0b01001000, 0b00001111 }, reversed);
-
-        // 空数组
-        var reversed2 = Number.ReverseBits(new byte[0]);
-        Assert.Empty(reversed2);
-    }
-
-    /// <summary>
-    /// 测试 GetLength
-    /// </summary>
-    [Fact]
-    public void Test_GetLength()
-    {
-        Assert.Equal(5, Number.GetLength(12345));
-        Assert.Equal(4, Number.GetLength(-123));
-        Assert.Equal(1, Number.GetLength(0));
-    }
-
-    /// <summary>
-    /// 测试 IntPow
-    /// </summary>
-    [Fact]
-    public void Test_IntPow()
-    {
-        Assert.Equal(8, Number.IntPow(2, 3));
-        Assert.Equal(1, Number.IntPow(5, 0));
-        Assert.Equal(0, Number.IntPow(0, 5));
-        Assert.Equal(7, Number.IntPow(7, 1));
-        Assert.Equal(81, Number.IntPow(3, 4));
-    }
-}

server.test/ProgressTrackerTest.cs

@@ -1,99 +0,0 @@
-using Microsoft.AspNetCore.SignalR;
-using Moq;
-using server.Hubs;
-using server.Services;
-
-public class ProgressTrackerTest
-{
-    [Fact]
-    public async Task Test_ProgressReporter_Basic()
-    {
-        int reportedValue = -1;
-        var reporter = new ProgressReporter(async v => { reportedValue = v; await Task.CompletedTask; }, 0, 100, 10);
-
-        // Report
-        reporter.Report(50);
-        Assert.Equal(50, reporter.Progress);
-        Assert.Equal(ProgressStatus.InProgress, reporter.Status);
-        Assert.Equal(50, reportedValue);
-
-        // Increase by step
-        reporter.Increase();
-        Assert.Equal(60, reporter.Progress);
-
-        // Increase by value
-        reporter.Increase(20);
-        Assert.Equal(80, reporter.Progress);
-
-        // Finish
-        reporter.Finish();
-        Assert.Equal(ProgressStatus.Completed, reporter.Status);
-        Assert.Equal(100, reporter.Progress);
-
-        // Cancel
-        reporter = new ProgressReporter(async v => { reportedValue = v; await Task.CompletedTask; }, 0, 100, 10);
-        reporter.Cancel();
-        Assert.Equal(ProgressStatus.Canceled, reporter.Status);
-        Assert.Equal("User Cancelled", reporter.ErrorMessage);
-
-        // Error
-        reporter = new ProgressReporter(async v => { reportedValue = v; await Task.CompletedTask; }, 0, 100, 10);
-        reporter.Error("Test Error");
-        Assert.Equal(ProgressStatus.Failed, reporter.Status);
-        Assert.Equal("Test Error", reporter.ErrorMessage);
-
-        // CreateChild
-        var parent = new ProgressReporter(async v => { await Task.CompletedTask; }, 10, 100, 5);
-        var child = parent.CreateChild(50, 5);
-        Assert.Equal(ProgressStatus.Pending, child.Status);
-        Assert.NotNull(child);
-
-        // Child Increase
-        child.Increase();
-        Assert.Equal(ProgressStatus.InProgress, child.Status);
-        Assert.Equal(20, child.ProgressPercent);
-        Assert.Equal(20, parent.Progress);
-
-        // Child Complete
-        child.Finish();
-        Assert.Equal(ProgressStatus.Completed, child.Status);
-        Assert.Equal(100, child.ProgressPercent);
-        Assert.Equal(60, parent.Progress);
-    }
-
-    [Fact]
-    public void Test_ProgressTrackerService_Basic()
-    {
-        // Mock SignalR HubContext
-        var mockHubContext = new Mock<IHubContext<ProgressHub, IProgressReceiver>>();
-        var service = new ProgressTrackerService(mockHubContext.Object);
-
-        // CreateTask
-        var (taskId, reporter) = service.CreateTask();
-        Assert.NotNull(taskId);
-        Assert.NotNull(reporter);
-
-        // GetReporter
-        var optReporter = service.GetReporter(taskId);
-        Assert.True(optReporter.HasValue);
-        Assert.Equal(reporter, optReporter.Value);
-
-        // GetProgressStatus
-        var optStatus = service.GetProgressStatus(taskId);
-        Assert.True(optStatus.HasValue);
-        Assert.Equal(ProgressStatus.Pending, optStatus.Value);
-
-        // BindTask
-        var bindResult = service.BindTask(taskId, "conn1");
-        Assert.True(bindResult);
-
-        // CancelTask
-        var cancelResult = service.CancelTask(taskId);
-        Assert.True(cancelResult);
-
-        // After cancel, status should be Cancelled
-        var optStatus2 = service.GetProgressStatus(taskId);
-        Assert.True(optStatus2.HasValue);
-        Assert.Equal(ProgressStatus.Canceled, optStatus2.Value);
-    }
-}

server.test/UDPServerTest.cs

@@ -0,0 +1,138 @@
+using System.Net;
+using System.Text;
+using Common;
+using Xunit.Abstractions;
+
+namespace server.test;
+
+
+public class UDPServerTest
+{
+    const string address = "127.0.0.1";
+    const int port = 33000;
+    private static readonly UDPServer udpServer = new UDPServer(port);
+
+    private readonly ITestOutputHelper output;
+
+    public UDPServerTest(ITestOutputHelper output)
+    {
+        this.output = output;
+        udpServer.Start();
+    }
+
+    [Fact]
+    public void UDPDataDeepClone()
+    {
+        var udpData = new UDPData()
+        {
+            DateTime = DateTime.Now,
+            Address = "127.0.0.1",
+            Port = 1234,
+            Data = new byte[] { 0xf0, 00, 00, 00 },
+            HasRead = false
+        };
+        var cloneUdpData = udpData.DeepClone();
+
+        Assert.Equal(udpData.DateTime, cloneUdpData.DateTime);
+        Assert.Equal(udpData.Address, cloneUdpData.Address);
+        Assert.Equal(udpData.Port, cloneUdpData.Port);
+        Assert.Equal(udpData.Data, cloneUdpData.Data);
+        Assert.Equal(udpData.HasRead, cloneUdpData.HasRead);
+
+        udpData.DateTime = DateTime.Now;
+        udpData.Address = "192.168.1.1";
+        udpData.Port = 33000;
+        udpData.Data = new byte[] { 0xFF, 00, 00, 00 };
+        udpData.HasRead = true;
+
+        Assert.NotNull(cloneUdpData.DateTime);
+        Assert.NotNull(cloneUdpData.Address);
+        Assert.NotNull(cloneUdpData.Port);
+        Assert.NotNull(cloneUdpData.Data);
+        Assert.NotNull(cloneUdpData.HasRead);
+
+        Assert.NotEqual(udpData.DateTime, cloneUdpData.DateTime);
+        Assert.NotEqual(udpData.Address, cloneUdpData.Address);
+        Assert.NotEqual(udpData.Port, cloneUdpData.Port);
+        Assert.NotEqual(udpData.Data, cloneUdpData.Data);
+        Assert.NotEqual(udpData.HasRead, cloneUdpData.HasRead);
+    }
+
+    [Theory]
+    [InlineData(new object[] { new string[] { "Hello World!", "Hello Server!", "What is your problem?" } })]
+    public async Task UDPServerFindString(string[] textArray)
+    {
+        Assert.True(udpServer.IsRunning);
+
+        var serverEP = new IPEndPoint(IPAddress.Parse(address), port);
+
+        foreach (var text in textArray)
+        {
+            Assert.True(await UDPClientPool.SendStringAsync(serverEP, [text]));
+            var ret = await udpServer.FindDataAsync(address);
+            Assert.True(ret.HasValue);
+            var data = ret.Value;
+            Assert.Equal(address, data.Address);
+            Assert.Equal(text, Encoding.ASCII.GetString(data.Data));
+        }
+    }
+
+    [Theory]
+    [InlineData(new object[] { new UInt32[] { 0xF0_00_00_00, 0xFF_00_00_00, 0xFF_FF_FF_FF } })]
+    public async Task UDPServerFindBytes(UInt32[] bytesArray)
+    {
+        Assert.True(udpServer.IsRunning);
+
+        var serverEP = new IPEndPoint(IPAddress.Parse(address), port);
+
+        foreach (var number in bytesArray)
+        {
+            Assert.True(await UDPClientPool.SendBytesAsync(serverEP, Number.NumberToBytes(number, 4).Value));
+            var ret = await udpServer.FindDataAsync(address);
+            Assert.True(ret.HasValue);
+            var data = ret.Value;
+            Assert.Equal(address, data.Address);
+            Assert.Equal(number, Number.BytesToUInt32(data.Data).Value);
+        }
+    }
+
+    [Theory]
+    [InlineData(new object[] { new UInt32[] { 0xF0_00_00_00, 0xF0_01_00_00 } })]
+    public async Task UDPServerWaitResp(UInt32[] bytesArray)
+    {
+        Assert.True(udpServer.IsRunning);
+
+        var serverEP = new IPEndPoint(IPAddress.Parse(address), port);
+
+        foreach (var number in bytesArray)
+        {
+            Assert.True(await UDPClientPool.SendBytesAsync(serverEP, Number.NumberToBytes(number, 4).Value));
+
+            var ret = await udpServer.WaitForAckAsync(address);
+            Assert.True(ret.IsSuccessful);
+            var data = ret.Value;
+            Assert.True(data.IsSuccessful);
+            Assert.Equal(number, Number.BytesToUInt32(data.ToBytes()).Value);
+        }
+    }
+
+    [Theory]
+    [InlineData(new object[] { new UInt64[] { 0x0F_00_00_00_01_02_02_02, 0x0F_01_00_00_FF_FF_FF_FF } })]
+    public async Task UDPServerWaitData(UInt64[] bytesArray)
+    {
+        Assert.True(udpServer.IsRunning);
+
+        var serverEP = new IPEndPoint(IPAddress.Parse(address), port);
+
+        foreach (var number in bytesArray)
+        {
+            Assert.True(await UDPClientPool.SendBytesAsync(serverEP, Number.NumberToBytes(number, 8).Value));
+
+            var ret = await udpServer.WaitForDataAsync(address);
+            Assert.True(ret.IsSuccessful);
+            var data = ret.Value;
+            Assert.True(data.IsSuccessful);
+            Assert.Equal((UInt64)number, Number.BytesToUInt64(data.ToBytes()).Value);
+        }
+    }
+}

server.test/server.test.csproj

@@ -11,7 +11,6 @@
     <PackageReference Include="coverlet.collector" Version="6.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.4" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>

server/Program.cs

@@ -7,11 +7,8 @@ using Microsoft.IdentityModel.Tokens;
 using Newtonsoft.Json;
 using NLog;
 using NLog.Web;
-using NSwag;
-using NSwag.CodeGeneration.TypeScript;
 using NSwag.Generation.Processors.Security;
 using server.Services;
-using TypedSignalR.Client.DevTools;
 
 // Early init of NLog to allow startup and exception logging, before host is built
 var logger = NLog.LogManager.Setup()
@@ -62,7 +59,7 @@ try
                 IssuerSigningKey = new SymmetricSecurityKey(
                     Encoding.UTF8.GetBytes("my secret key 1234567890my secret key 1234567890")),
             };
-            options.Authority = $"http://{Global.localhost}:5000";
+            options.Authority = "http://localhost:5000";
             options.RequireHttpsMetadata = false;
         });
     // Add JWT Token Authorization Policy
@@ -95,17 +92,8 @@ try
             .AllowAnyMethod()
             .AllowAnyHeader()
         );
-        options.AddPolicy("SignalR", policy => policy
-            .WithOrigins("http://localhost:5173")
-            .AllowAnyHeader()
-            .AllowAnyMethod()
-            .AllowCredentials()
-        );
     });
 
-    // Use SignalR
-    builder.Services.AddSignalR();
-
     // Add Swagger
     builder.Services.AddSwaggerDocument(options =>
     {
@@ -145,12 +133,6 @@ try
     // 添加 HTTP 视频流服务
     builder.Services.AddSingleton<HttpVideoStreamService>();
     builder.Services.AddHostedService(provider => provider.GetRequiredService<HttpVideoStreamService>());
-    builder.Services.AddSingleton<HttpHdmiVideoStreamService>();
-    builder.Services.AddHostedService(provider => provider.GetRequiredService<HttpHdmiVideoStreamService>());
-
-    // 添加进度跟踪服务
-    builder.Services.AddSingleton<ProgressTrackerService>();
-    builder.Services.AddHostedService(provider => provider.GetRequiredService<ProgressTrackerService>());
 
     // Application Settings
     var app = builder.Build();
@@ -183,17 +165,6 @@ try
             FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "log")),
             RequestPath = "/log"
         });
-
-        // Exam Files (实验静态资源)
-        if (Directory.Exists(Path.Combine(Directory.GetCurrentDirectory(), "exam")))
-        {
-            app.UseStaticFiles(new StaticFileOptions
-            {
-                FileProvider = new PhysicalFileProvider(Path.Combine(Directory.GetCurrentDirectory(), "exam")),
-                RequestPath = "/exam"
-            });
-        }
-
         app.MapFallbackToFile("index.html");
     }
 
@@ -204,57 +175,15 @@ try
     app.UseAuthorization();
 
     // Swagger
-    app.UseOpenApi(settings =>
+    app.UseOpenApi();
-    {
-        settings.PostProcess = (document, httpRequest) =>
-        {
-            document.Servers.Clear();
-            document.Servers.Add(new NSwag.OpenApiServer { Url = $"http://{Global.localhost}:5000" });
-        };
-    });
     app.UseSwaggerUi();
 
-    // SignalR
-    app.UseWebSockets();
-    app.UseSignalRHubSpecification();
-    app.UseSignalRHubDevelopmentUI();
-
     // Router
     app.MapControllers();
-    app.MapHub<server.Hubs.JtagHub>("hubs/JtagHub");
-    app.MapHub<server.Hubs.ProgressHub>("hubs/ProgressHub");
 
     // Setup Program
     MsgBus.Init();
 
-    // Generate API Client
-    app.MapGet("GetAPIClientCode", async (HttpContext context) =>
-    {
-        try
-        {
-            var document = await OpenApiDocument.FromUrlAsync($"http://{Global.localhost}:5000/swagger/v1/swagger.json");
-
-            var settings = new TypeScriptClientGeneratorSettings
-            {
-                ClassName = "{controller}Client",
-                UseAbortSignal = false,
-                Template = TypeScriptTemplate.Axios,
-                TypeScriptGeneratorSettings = {
-                },
-            };
-
-            var generator = new TypeScriptClientGenerator(document, settings);
-            var code = generator.GenerateFile();
-
-            return Results.Text(code, "text/plain; charset=utf-8", Encoding.UTF8);
-        }
-        catch (Exception err)
-        {
-            logger.Error(err);
-            return Results.Problem(err.ToString());
-        }
-    }).RequireCors("Development");
-
     app.Run();
 }
 catch (Exception exception)
@@ -274,3 +203,4 @@ finally
     // Close Program
     MsgBus.Exit();
 }
+

server/Properties/launchSettings.json

@@ -5,7 +5,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "http://0.0.0.0:5000",
+      "applicationUrl": "http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
@@ -15,7 +15,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://0.0.0.0:7278;http://0.0.0.0:5000",
+      "applicationUrl": "https://localhost:7278;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development",
         "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"

server/server.csproj

@@ -14,7 +14,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ArpLookup" Version="2.0.3" />
     <PackageReference Include="DotNext" Version="5.23.0" />
     <PackageReference Include="DotNext.Threading" Version="5.23.0" />
     <PackageReference Include="Honoo.IO.Hashing.Crc" Version="1.3.3" />
@@ -27,21 +26,10 @@
     <PackageReference Include="NLog" Version="5.4.0" />    
     <PackageReference Include="NLog.Web.AspNetCore" Version="5.4.0" />
     <PackageReference Include="NSwag.AspNetCore" Version="14.3.0" />
-    <PackageReference Include="NSwag.CodeGeneration.TypeScript" Version="14.4.0" />
     <PackageReference Include="OpenCvSharp4" Version="4.11.0.20250507" />
     <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
     <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
-    <PackageReference Include="Tapper.Analyzer" Version="1.13.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="TypedSignalR.Client.DevTools" Version="1.2.4" />
-    <PackageReference Include="TypedSignalR.Client.TypeScript.Analyzer" Version="1.15.0">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="TypedSignalR.Client.TypeScript.Attributes" Version="1.15.0" />
   </ItemGroup>
 
 </Project>

server/src/ArpClient.cs

@@ -1,14 +1,11 @@
 using System.Diagnostics;
-using System.Net.NetworkInformation;
-using ArpLookup;
 using System.Runtime.InteropServices;
-using System.Net;
 using System.Text.RegularExpressions;
 
 /// <summary>
 /// ARP 记录管理静态类（跨平台支持）
 /// </summary>
-public static class ArpClient
+public static class Arp
 {
     private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
 
@@ -47,28 +44,20 @@ public static class ArpClient
     }
 
     /// <summary>
-    /// 动态更新指定 IP 的 ARP 记录
+    /// 通过 Ping 动态更新指定 IP 的 ARP 记录
     /// </summary>
     /// <param name="ipAddress">要更新的 IP 地址</param>
     /// <returns>是否成功发送 Ping</returns>
-    public static async Task<bool> UpdateArpEntryAsync(string ipAddress)
+    public static async Task<bool> UpdateArpEntryByPingAsync(string ipAddress)
     {
         if (string.IsNullOrWhiteSpace(ipAddress))
             throw new ArgumentException("IP 地址不能为空", nameof(ipAddress));
 
         try
         {
-            var ret = await ArpClient.DeleteArpEntryAsync(ipAddress);
+            using var ping = new System.Net.NetworkInformation.Ping();
-            if (!ret)
+            var reply = await ping.SendPingAsync(ipAddress, 100);
-            {
+            return reply.Status == System.Net.NetworkInformation.IPStatus.Success;
-                logger.Error($"删除 ARP 记录失败: {ipAddress}");
-            }
-
-            PhysicalAddress? mac = await Arp.LookupAsync(IPAddress.Parse(ipAddress));
-            if (mac == null)
-                return false;
-
-            return true;
         }
         catch
         {

server/src/Common/Global.cs

@@ -1,21 +0,0 @@
-using System.Net;
-using System.Net.Sockets;
-
-public static class Global
-{
-
-    public static readonly string localhost = "127.0.0.1";
-
-    public static string GetLocalIPAddress()
-    {
-        var host = Dns.GetHostEntry(Dns.GetHostName());
-        foreach (var ip in host.AddressList)
-        {
-            if (ip.AddressFamily == AddressFamily.InterNetwork)
-            {
-                return ip.ToString();
-            }
-        }
-        throw new Exception("No network adapters with an IPv4 address in the system!");
-    }
-}

server/src/Common/Number.cs

@@ -65,7 +65,7 @@ public class Number
         {
             for (var i = 0; i < length; i++)
             {
-                arr[i] = Convert.ToByte((num >> (i << 3)) & (0xFF));
+                arr[length - 1 - i] = Convert.ToByte((num >> (i << 3)) & (0xFF));
             }
         }
         else
@@ -99,11 +99,20 @@ public class Number
 
         try
         {
-            if (!isLowNumHigh)
+            if (isLowNumHigh)
             {
-                Array.Reverse(bytes);
+                for (var i = 0; i < len; i++)
+                {
+                    num += Convert.ToUInt64((UInt64)bytes[len - 1 - i] << (i << 3));
+                }
+            }
+            else
+            {
+                for (var i = 0; i < len; i++)
+                {
+                    num += Convert.ToUInt64((UInt64)bytes[i] << ((int)(len - 1 - i) << 3));
+                }
             }
-            num = BitConverter.ToUInt64(bytes, 0);
 
             return num;
         }
@@ -134,11 +143,20 @@ public class Number
 
         try
         {
-            if (!isLowNumHigh)
+            if (isLowNumHigh)
             {
-                Array.Reverse(bytes);
+                for (var i = 0; i < len; i++)
+                {
+                    num += Convert.ToUInt32((UInt32)bytes[len - 1 - i] << (i << 3));
+                }
+            }
+            else
+            {
+                for (var i = 0; i < len; i++)
+                {
+                    num += Convert.ToUInt32((UInt32)bytes[i] << ((int)(len - 1 - i) << 3));
+                }
             }
-            num = BitConverter.ToUInt32(bytes, 0);
 
             return num;
         }
@@ -315,9 +333,10 @@ public class Number
 
         for (int i = 0; i < srcBytesLen; i += distance)
         {
-            Buffer.BlockCopy(srcBytes, i, buffer, 0, distance);
+            var end = i + distance;
+            buffer = srcBytes[i..end];
             Array.Reverse(buffer);
-            Buffer.BlockCopy(buffer, 0, dstBytes, i, distance);
+            Array.Copy(buffer, 0, dstBytes, i, distance);
         }
 
         return dstBytes;
@@ -348,37 +367,4 @@ public class Number
         }
         return dstBytes;
     }
-
-    /// <summary>
-    /// 获取数字的长度
-    /// </summary>
-    /// <param name="number">数字</param>
-    /// <returns>数字的长度</returns>
-    public static int GetLength(int number)
-    {
-        // 将整数转换为字符串
-        string numberString = number.ToString();
-
-        // 返回字符串的长度
-        return numberString.Length;
-    }
-
-    /// <summary>
-    /// 计算整形的幂
-    /// </summary>
-    /// <param name="x">底数</param>
-    /// <param name="pow">幂</param>
-    /// <returns>计算结果</returns>
-    public static int IntPow(int x, int pow)
-    {
-        int ret = 1;
-        while (pow != 0)
-        {
-            if ((pow & 1) == 1)
-                ret *= x;
-            x *= x;
-            pow >>= 1;
-        }
-        return ret;
-    }
 }

server/src/Controllers/DataController.cs

@@ -278,7 +278,7 @@ public class DataController : ControllerBase
                 return NotFound("没有可用的实验板");
 
             var boardInfo = boardOpt.Value;
-            if (!(await ArpClient.CheckOrAddAsync(boardInfo.IpAddr, boardInfo.MacAddr, GetLocalIPAddress().ToString())))
+            if (!(await Arp.CheckOrAddAsync(boardInfo.IpAddr, boardInfo.MacAddr, GetLocalIPAddress().ToString())))
             {
                 logger.Error($"无法配置ARP，实验板可能会无法连接");
             }
@@ -346,7 +346,7 @@ public class DataController : ControllerBase
                 return NotFound("未找到对应的实验板");
 
             var boardInfo = ret.Value.Value;
-            if (!(await ArpClient.CheckOrAddAsync(boardInfo.IpAddr, boardInfo.MacAddr, GetLocalIPAddress().ToString())))
+            if (!(await Arp.CheckOrAddAsync(boardInfo.IpAddr, boardInfo.MacAddr, GetLocalIPAddress().ToString())))
             {
                 logger.Error($"无法配置ARP，实验板可能会无法连接");
             }
@@ -490,3 +490,4 @@ public class DataController : ControllerBase
         }
     }
 }
+

server/src/Controllers/DebuggerController.cs

@@ -1,467 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.Mvc;
-using Peripherals.DebuggerClient;
-
-namespace server.Controllers;
-
-/// <summary>
-/// FPGA调试器控制器，提供信号捕获、触发、数据读取等调试相关API
-/// </summary>
-[ApiController]
-[Route("api/[controller]")]
-[Authorize]
-public class DebuggerController : ControllerBase
-{
-    private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-
-    /// <summary>
-    /// 表示单个信号通道的配置信息
-    /// </summary>
-    public class ChannelConfig
-    {
-        /// <summary>
-        /// 通道名称
-        /// </summary>
-        required public string name;
-        /// <summary>
-        /// 通道显示颜色（如前端波形显示用）
-        /// </summary>
-        required public string color;
-        /// <summary>
-        /// 通道信号线宽度（位数）
-        /// </summary>
-        required public UInt32 wireWidth;
-        /// <summary>
-        /// 信号线在父端口中的起始索引（bit）
-        /// </summary>
-        required public UInt32 wireStartIndex;
-        /// <summary>
-        /// 父端口编号
-        /// </summary>
-        required public UInt32 parentPort;
-        /// <summary>
-        /// 捕获模式（如上升沿、下降沿等）
-        /// </summary>
-        required public CaptureMode mode;
-    }
-
-    /// <summary>
-    /// 调试器整体配置信息
-    /// </summary>
-    public class DebuggerConfig
-    {
-        /// <summary>
-        /// 时钟频率
-        /// </summary>
-        required public UInt32 clkFreq;
-        /// <summary>
-        /// 总端口数量
-        /// </summary>
-        required public UInt32 totalPortNum;
-        /// <summary>
-        /// 捕获深度（采样点数）
-        /// </summary>
-        required public UInt32 captureDepth;
-        /// <summary>
-        /// 触发器数量
-        /// </summary>
-        required public UInt32 triggerNum;
-        /// <summary>
-        /// 所有信号通道的配置信息
-        /// </summary>
-        required public ChannelConfig[] channelConfigs;
-    }
-
-    /// <summary>
-    /// 单个通道的捕获数据
-    /// </summary>
-    public class ChannelCaptureData
-    {
-        /// <summary>
-        /// 通道名称
-        /// </summary>
-        required public string name;
-        /// <summary>
-        /// 通道捕获到的数据（Base64编码的UInt32数组）
-        /// </summary>
-        required public string data;
-    }
-
-    /// <summary>
-    /// 获取当前用户绑定的调试器实例
-    /// </summary>
-    private DebuggerClient? GetDebugger()
-    {
-        try
-        {
-            var userName = User.Identity?.Name;
-            if (string.IsNullOrEmpty(userName))
-                return null;
-
-            using var db = new Database.AppDataConnection();
-            var userRet = db.GetUserByName(userName);
-            if (!userRet.IsSuccessful || !userRet.Value.HasValue)
-                return null;
-
-            var user = userRet.Value.Value;
-            if (user.BoardID == Guid.Empty)
-                return null;
-
-            var boardRet = db.GetBoardByID(user.BoardID);
-            if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
-                return null;
-
-            var board = boardRet.Value.Value;
-            return new DebuggerClient(board.IpAddr, board.Port, 1);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "获取调试器实例时发生异常");
-            return null;
-        }
-    }
-
-    /// <summary>
-    /// 设置指定信号线的捕获模式
-    /// </summary>
-    /// <param name="wireNum">信号线编号（0~511）</param>
-    /// <param name="mode">捕获模式</param>
-    [HttpPost("SetMode")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> SetMode(UInt32 wireNum, CaptureMode mode)
-    {
-        if (wireNum > 512)
-        {
-            return BadRequest($"最多只能建立512位信号线");
-        }
-
-        try
-        {
-            var debugger = GetDebugger();
-            if (debugger == null)
-                return BadRequest("用户未绑定有效的实验板");
-
-            var result = await debugger.SetMode(wireNum, mode);
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"设置捕获模式失败: {result.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "设置捕获模式失败");
-            }
-
-            return Ok(result.Value);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "设置捕获模式时发生异常");
-            return StatusCode(StatusCodes.Status500InternalServerError, "操作失败，请稍后重试");
-        }
-    }
-
-    /// <summary>
-    /// 为每个通道中的每根线设置捕获模式
-    /// </summary>
-    /// <param name="config">调试器配置信息，包含所有通道的捕获模式设置</param>
-    [HttpPost("SetChannelsMode")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> SetChannelsMode([FromBody] DebuggerConfig config)
-    {
-        if (config == null || config.channelConfigs == null)
-            return BadRequest("配置无效");
-
-        try
-        {
-            var debugger = GetDebugger();
-            if (debugger == null)
-                return BadRequest("用户未绑定有效的实验板");
-
-            foreach (var channel in config.channelConfigs)
-            {
-                // 检查每个通道的配置
-                if (channel.wireWidth > 32 ||
-                    channel.wireStartIndex > 32 ||
-                    channel.wireStartIndex + channel.wireWidth > 32)
-                {
-                    return BadRequest($"通道 {channel.name} 配置错误");
-                }
-
-                for (uint i = 0; i < channel.wireWidth; i++)
-                {
-                    var result = await debugger.SetMode(channel.wireStartIndex * (channel.parentPort * 32) + i, channel.mode);
-                    if (!result.IsSuccessful)
-                    {
-                        logger.Error($"设置通道 {channel.name} 第 {i} 根线捕获模式失败: {result.Error}");
-                        return StatusCode(StatusCodes.Status500InternalServerError, $"设置通道 {channel.name} 第 {i} 根线捕获模式失败");
-                    }
-                }
-            }
-
-            return Ok(true);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "为每个通道中的每根线设置捕获模式时发生异常");
-            return StatusCode(StatusCodes.Status500InternalServerError, "操作失败，请稍后重试");
-        }
-    }
-
-    /// <summary>
-    /// 启动触发器，开始信号捕获
-    /// </summary>
-    [HttpPost("StartTrigger")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> StartTrigger()
-    {
-        try
-        {
-            var debugger = GetDebugger();
-            if (debugger == null)
-                return BadRequest("用户未绑定有效的实验板");
-
-            var result = await debugger.StartTrigger();
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"启动触发器失败: {result.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "启动触发器失败");
-            }
-
-            return Ok(result.Value);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "启动触发器时发生异常");
-            return StatusCode(StatusCodes.Status500InternalServerError, "操作失败，请稍后重试");
-        }
-    }
-
-    /// <summary>
-    /// 读取触发器状态标志
-    /// </summary>
-    [HttpGet("ReadFlag")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(byte), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> ReadFlag()
-    {
-        try
-        {
-            var debugger = GetDebugger();
-            if (debugger == null)
-                return BadRequest("用户未绑定有效的实验板");
-
-            var result = await debugger.ReadFlag();
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"读取触发器状态标志失败: {result.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "读取触发器状态标志失败");
-            }
-
-            return Ok(result.Value);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "读取触发器状态标志时发生异常");
-            return StatusCode(StatusCodes.Status500InternalServerError, "操作失败，请稍后重试");
-        }
-    }
-
-    /// <summary>
-    /// 清除触发器状态标志
-    /// </summary>
-    [HttpPost("ClearFlag")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> ClearFlag()
-    {
-        try
-        {
-            var debugger = GetDebugger();
-            if (debugger == null)
-                return BadRequest("用户未绑定有效的实验板");
-
-            var result = await debugger.ClearFlag();
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"清除触发器状态标志失败: {result.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "清除触发器状态标志失败");
-            }
-
-            return Ok(result.Value);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "清除触发器状态标志时发生异常");
-            return StatusCode(StatusCodes.Status500InternalServerError, "操作失败，请稍后重试");
-        }
-    }
-
-    /// <summary>
-    /// 读取捕获数据（等待触发完成后返回各通道采样数据）
-    /// </summary>
-    /// <param name="config">调试器配置信息，包含采样深度、端口数、通道配置等</param>
-    /// <param name="cancellationToken">取消操作的令牌</param>
-    [HttpPost("ReadData")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(ChannelCaptureData[]), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> ReadData([FromBody] DebuggerConfig config, CancellationToken cancellationToken)
-    {
-        // 检查每个通道的配置
-        foreach (var channel in config.channelConfigs)
-        {
-            if (channel.wireWidth > 32 ||
-                channel.wireStartIndex > 32 ||
-                channel.wireStartIndex + channel.wireWidth > 32)
-            {
-                return BadRequest($"通道 {channel.name} 配置错误");
-            }
-        }
-
-        try
-        {
-            var debugger = GetDebugger();
-            if (debugger == null)
-                return BadRequest("用户未绑定有效的实验板");
-
-            // 等待捕获标志位
-            while (true)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                var flagResult = await debugger.ReadFlag();
-                if (!flagResult.IsSuccessful)
-                {
-                    logger.Error($"读取捕获标志失败: {flagResult.Error}");
-                    return StatusCode(StatusCodes.Status500InternalServerError, "读取捕获标志失败");
-                }
-                if (flagResult.Value == 1)
-                {
-                    var clearResult = await debugger.ClearFlag();
-                    if (!clearResult.IsSuccessful)
-                    {
-                        logger.Error($"清除捕获标志失败: {clearResult.Error}");
-                        return StatusCode(StatusCodes.Status500InternalServerError, "清除捕获标志失败");
-                    }
-                    break;
-                }
-                await Task.Delay(500, cancellationToken);
-            }
-
-            var dataResult = await debugger.ReadData(config.totalPortNum);
-            if (!dataResult.IsSuccessful)
-            {
-                logger.Error($"读取捕获数据失败: {dataResult.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "读取捕获数据失败");
-            }
-
-            var freshResult = await debugger.Refresh();
-            if (!freshResult.IsSuccessful)
-            {
-                logger.Error($"刷新调试器状态失败: {freshResult.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "刷新调试器状态失败");
-            }
-
-            var rawData = dataResult.Value;
-            // logger.Debug($"rawData: {BitConverter.ToString(rawData)}");
-            int depth = (int)config.captureDepth;
-            int portDataLen = 4 * depth;
-            int portNum = (int)config.totalPortNum;
-            var channelDataList = new List<ChannelCaptureData>();
-
-            foreach (var channel in config.channelConfigs)
-            {
-                int port = (int)channel.parentPort;
-                int wireStart = (int)channel.wireStartIndex;
-                int wireWidth = (int)channel.wireWidth;
-
-                // 每个port的数据长度
-                int portOffset = port * portDataLen;
-
-                var channelUintArr = new UInt32[depth];
-                for (int i = 0; i < depth; i++)
-                {
-                    // 取出该port的第i个采样点的4字节
-                    int sampleOffset = portOffset + i * 4;
-                    if (sampleOffset + 4 > rawData.Length)
-                    {
-                        logger.Error($"数据越界: port {port}, sample {i}");
-                        return StatusCode(StatusCodes.Status500InternalServerError, "数据越界");
-                    }
-                    var sampleBytes = rawData[sampleOffset..(sampleOffset + 4)];
-                    UInt32 sample = Common.Number.BytesToUInt32(sampleBytes, true).Value;
-                    // 提取wireWidth位
-                    UInt32 mask = (wireWidth == 32) ? 0xFFFFFFFF : ((1u << wireWidth) - 1u);
-                    channelUintArr[i] = (sample >> wireStart) & mask;
-                }
-                var channelBytes = new byte[4 * depth];
-                Buffer.BlockCopy(channelUintArr, 0, channelBytes, 0, channelBytes.Length);
-                // logger.Debug($"{channel.name} HexData: {BitConverter.ToString(channelBytes)}");
-                var base64 = Convert.ToBase64String(channelBytes);
-                channelDataList.Add(new ChannelCaptureData { name = channel.name, data = base64 });
-            }
-
-            return Ok(channelDataList.ToArray());
-        }
-        catch (OperationCanceledException)
-        {
-            logger.Info("读取捕获数据请求被取消");
-            return StatusCode(StatusCodes.Status499ClientClosedRequest, "客户端已取消请求");
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "读取捕获数据时发生异常");
-            return StatusCode(StatusCodes.Status500InternalServerError, "操作失败，请稍后重试");
-        }
-    }
-
-    /// <summary>
-    /// 刷新调试器状态（重置采集状态等）
-    /// </summary>
-    [HttpPost("Refresh")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> Refresh()
-    {
-        try
-        {
-            var debugger = GetDebugger();
-            if (debugger == null)
-                return BadRequest("用户未绑定有效的实验板");
-
-            var result = await debugger.Refresh();
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"刷新调试器状态失败: {result.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "刷新调试器状态失败");
-            }
-
-            return Ok(result.Value);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "刷新调试器状态时发生异常");
-            return StatusCode(StatusCodes.Status500InternalServerError, "操作失败，请稍后重试");
-        }
-    }
-}

server/src/Controllers/ExamController.cs

@@ -1,291 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.Mvc;
-using DotNext;
-
-namespace server.Controllers;
-
-/// <summary>
-/// 实验控制器
-/// </summary>
-[ApiController]
-[Route("api/[controller]")]
-public class ExamController : ControllerBase
-{
-    private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-
-    /// <summary>
-    /// 实验信息类
-    /// </summary>
-    public class ExamInfo
-    {
-        /// <summary>
-        /// 实验的唯一标识符
-        /// </summary>
-        public required string ID { get; set; }
-
-        /// <summary>
-        /// 实验名称
-        /// </summary>
-        public required string Name { get; set; }
-
-        /// <summary>
-        /// 实验描述
-        /// </summary>
-        public required string Description { get; set; }
-
-        /// <summary>
-        /// 实验创建时间
-        /// </summary>
-        public DateTime CreatedTime { get; set; }
-
-        /// <summary>
-        /// 实验最后更新时间
-        /// </summary>
-        public DateTime UpdatedTime { get; set; }
-
-        /// <summary>
-        /// 实验标签
-        /// </summary>
-        public string[] Tags { get; set; } = Array.Empty<string>();
-
-        /// <summary>
-        /// 实验难度（1-5）
-        /// </summary>
-        public int Difficulty { get; set; } = 1;
-
-        /// <summary>
-        /// 普通用户是否可见
-        /// </summary>
-        public bool IsVisibleToUsers { get; set; } = true;
-    }
-
-    /// <summary>
-    /// 实验简要信息类（用于列表显示）
-    /// </summary>
-    public class ExamSummary
-    {
-        /// <summary>
-        /// 实验的唯一标识符
-        /// </summary>
-        public required string ID { get; set; }
-
-        /// <summary>
-        /// 实验名称
-        /// </summary>
-        public required string Name { get; set; }
-
-        /// <summary>
-        /// 实验创建时间
-        /// </summary>
-        public DateTime CreatedTime { get; set; }
-
-        /// <summary>
-        /// 实验最后更新时间
-        /// </summary>
-        public DateTime UpdatedTime { get; set; }
-
-        /// <summary>
-        /// 实验标签
-        /// </summary>
-        public string[] Tags { get; set; } = Array.Empty<string>();
-
-        /// <summary>
-        /// 实验难度（1-5）
-        /// </summary>
-        public int Difficulty { get; set; } = 1;
-
-        /// <summary>
-        /// 普通用户是否可见
-        /// </summary>
-        public bool IsVisibleToUsers { get; set; } = true;
-    }
-
-    /// <summary>
-    /// 创建实验请求类
-    /// </summary>
-    public class CreateExamRequest
-    {
-        /// <summary>
-        /// 实验ID
-        /// </summary>
-        public required string ID { get; set; }
-
-        /// <summary>
-        /// 实验名称
-        /// </summary>
-        public required string Name { get; set; }
-
-        /// <summary>
-        /// 实验描述
-        /// </summary>
-        public required string Description { get; set; }
-
-        /// <summary>
-        /// 实验标签
-        /// </summary>
-        public string[] Tags { get; set; } = Array.Empty<string>();
-
-        /// <summary>
-        /// 实验难度（1-5）
-        /// </summary>
-        public int Difficulty { get; set; } = 1;
-
-        /// <summary>
-        /// 普通用户是否可见
-        /// </summary>
-        public bool IsVisibleToUsers { get; set; } = true;
-    }
-
-    /// <summary>
-    /// 获取所有实验列表
-    /// </summary>
-    /// <returns>实验列表</returns>
-    [Authorize]
-    [HttpGet("list")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(ExamSummary[]), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    public IActionResult GetExamList()
-    {
-        try
-        {
-            using var db = new Database.AppDataConnection();
-            var exams = db.GetAllExams();
-
-            var examSummaries = exams.Select(exam => new ExamSummary
-            {
-                ID = exam.ID,
-                Name = exam.Name,
-                CreatedTime = exam.CreatedTime,
-                UpdatedTime = exam.UpdatedTime,
-                Tags = exam.GetTagsList(),
-                Difficulty = exam.Difficulty,
-                IsVisibleToUsers = exam.IsVisibleToUsers
-            }).ToArray();
-
-            logger.Info($"成功获取实验列表，共 {examSummaries.Length} 个实验");
-            return Ok(examSummaries);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"获取实验列表时出错: {ex.Message}");
-            return StatusCode(StatusCodes.Status500InternalServerError, $"获取实验列表失败: {ex.Message}");
-        }
-    }
-
-    /// <summary>
-    /// 根据实验ID获取实验详细信息
-    /// </summary>
-    /// <param name="examId">实验ID</param>
-    /// <returns>实验详细信息</returns>
-    [Authorize]
-    [HttpGet("{examId}")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(ExamInfo), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    public IActionResult GetExam(string examId)
-    {
-        if (string.IsNullOrWhiteSpace(examId))
-            return BadRequest("实验ID不能为空");
-
-        try
-        {
-            using var db = new Database.AppDataConnection();
-            var result = db.GetExamByID(examId);
-
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"获取实验时出错: {result.Error.Message}");
-                return StatusCode(StatusCodes.Status500InternalServerError, $"获取实验失败: {result.Error.Message}");
-            }
-
-            if (!result.Value.HasValue)
-            {
-                logger.Warn($"实验不存在: {examId}");
-                return NotFound($"实验 {examId} 不存在");
-            }
-
-            var exam = result.Value.Value;
-            var examInfo = new ExamInfo
-            {
-                ID = exam.ID,
-                Name = exam.Name,
-                Description = exam.Description,
-                CreatedTime = exam.CreatedTime,
-                UpdatedTime = exam.UpdatedTime,
-                Tags = exam.GetTagsList(),
-                Difficulty = exam.Difficulty,
-                IsVisibleToUsers = exam.IsVisibleToUsers
-            };
-
-            logger.Info($"成功获取实验信息: {examId}");
-            return Ok(examInfo);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"获取实验 {examId} 时出错: {ex.Message}");
-            return StatusCode(StatusCodes.Status500InternalServerError, $"获取实验失败: {ex.Message}");
-        }
-    }
-
-    /// <summary>
-    /// 创建新实验
-    /// </summary>
-    /// <param name="request">创建实验请求</param>
-    /// <returns>创建结果</returns>
-    [Authorize("Admin")]
-    [HttpPost]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(ExamInfo), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status403Forbidden)]
-    [ProducesResponseType(StatusCodes.Status409Conflict)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    public IActionResult CreateExam([FromBody] CreateExamRequest request)
-    {
-        if (string.IsNullOrWhiteSpace(request.ID) || string.IsNullOrWhiteSpace(request.Name) || string.IsNullOrWhiteSpace(request.Description))
-            return BadRequest("实验ID、名称和描述不能为空");
-
-        try
-        {
-            using var db = new Database.AppDataConnection();
-            var result = db.CreateExam(request.ID, request.Name, request.Description, request.Tags, request.Difficulty, request.IsVisibleToUsers);
-
-            if (!result.IsSuccessful)
-            {
-                if (result.Error.Message.Contains("已存在"))
-                    return Conflict(result.Error.Message);
-                
-                logger.Error($"创建实验时出错: {result.Error.Message}");
-                return StatusCode(StatusCodes.Status500InternalServerError, $"创建实验失败: {result.Error.Message}");
-            }
-
-            var exam = result.Value;
-            var examInfo = new ExamInfo
-            {
-                ID = exam.ID,
-                Name = exam.Name,
-                Description = exam.Description,
-                CreatedTime = exam.CreatedTime,
-                UpdatedTime = exam.UpdatedTime,
-                Tags = exam.GetTagsList(),
-                Difficulty = exam.Difficulty,
-                IsVisibleToUsers = exam.IsVisibleToUsers
-            };
-
-            logger.Info($"成功创建实验: {request.ID}");
-            return CreatedAtAction(nameof(GetExam), new { examId = request.ID }, examInfo);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"创建实验 {request.ID} 时出错: {ex.Message}");
-            return StatusCode(StatusCodes.Status500InternalServerError, $"创建实验失败: {ex.Message}");
-        }
-    }
-}

server/src/Controllers/HdmiVideoStreamController.cs

@@ -1,97 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.Authorization;
-using System.Security.Claims;
-using server.Services;
-using Database;
-
-namespace server.Controllers;
-
-[ApiController]
-[Route("api/[controller]")]
-[EnableCors("Users")]
-public class HdmiVideoStreamController : ControllerBase
-{
-    private readonly HttpHdmiVideoStreamService _videoStreamService;
-    private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-
-    public HdmiVideoStreamController(HttpHdmiVideoStreamService videoStreamService)
-    {
-        _videoStreamService = videoStreamService;
-    }
-
-    // 管理员获取所有板子的 endpoints
-    [HttpGet("AllEndpoints")]
-    [Authorize("Admin")]
-    public ActionResult<List<HdmiVideoStreamEndpoint>> GetAllEndpoints()
-    {
-        var endpoints = _videoStreamService.GetAllVideoEndpoints();
-        if (endpoints == null)
-            return NotFound("No boards found.");
-        return Ok(endpoints);
-    }
-
-    // 用户获取自己板子的 endpoint
-    [HttpGet("MyEndpoint")]
-    [Authorize]
-    public ActionResult<HdmiVideoStreamEndpoint> GetMyEndpoint()
-    {
-        var userName = User.FindFirstValue(ClaimTypes.Name);
-        if (string.IsNullOrEmpty(userName))
-            return Unauthorized("User name not found in claims.");
-
-        var db = new AppDataConnection();
-        if (db == null)
-            return NotFound("Database connection failed.");
-
-        var userRet = db.GetUserByName(userName);
-        if (!userRet.IsSuccessful || !userRet.Value.HasValue)
-            return NotFound("User not found.");
-
-        var user = userRet.Value.Value;
-        var boardId = user.BoardID;
-        if (boardId == Guid.Empty)
-            return NotFound("No board bound to this user.");
-
-        var boardRet = db.GetBoardByID(boardId);
-        if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
-            return NotFound("Board not found.");
-
-        var endpoint = _videoStreamService.GetVideoEndpoint(boardId.ToString());
-        return Ok(endpoint);
-    }
-
-    // 禁用指定板子的 HDMI 传输
-    [HttpPost("DisableHdmiTransmission")]
-    [Authorize]
-    public async Task<IActionResult> DisableHdmiTransmission()
-    {
-        var userName = User.FindFirstValue(ClaimTypes.Name);
-        if (string.IsNullOrEmpty(userName))
-            return Unauthorized("User name not found in claims.");
-
-        var db = new AppDataConnection();
-        if (db == null)
-            return NotFound("Database connection failed.");
-
-        var userRet = db.GetUserByName(userName);
-        if (!userRet.IsSuccessful || !userRet.Value.HasValue)
-            return NotFound("User not found.");
-
-        var user = userRet.Value.Value;
-        var boardId = user.BoardID;
-        if (boardId == Guid.Empty)
-            return NotFound("No board bound to this user.");
-
-        try
-        {
-            await _videoStreamService.DisableHdmiTransmissionAsync(boardId.ToString());
-            return Ok($"HDMI transmission for board {boardId} disabled.");
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, $"Failed to disable HDMI transmission for board {boardId}");
-            return StatusCode(500, $"Error disabling HDMI transmission: {ex.Message}");
-        }
-    }
-}

server/src/Controllers/JtagController.cs

@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
-using Database;
-using server.Services;
 
 namespace server.Controllers;
 
@@ -16,15 +14,8 @@ public class JtagController : ControllerBase
 {
     private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
 
-    private readonly ProgressTrackerService _tracker;
-
     private const string BITSTREAM_PATH = "bitstream/Jtag";
 
-    public JtagController(ProgressTrackerService tracker)
-    {
-        _tracker = tracker;
-    }
-
     /// <summary>
     /// 控制器首页信息
     /// </summary>
@@ -121,96 +112,116 @@ public class JtagController : ControllerBase
         }
     }
 
+    /// <summary>
+    /// 上传比特流文件到服务器
+    /// </summary>
+    /// <param name="address">目标设备地址</param>
+    /// <param name="file">比特流文件</param>
+    /// <returns>上传结果</returns>
+    [HttpPost("UploadBitstream")]
+    [EnableCors("Users")]
+    [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]
+    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
+    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+    public async ValueTask<IResult> UploadBitstream(string address, IFormFile file)
+    {
+        logger.Info($"User {User.Identity?.Name} uploading bitstream for device {address}");
+
+        if (file == null || file.Length == 0)
+        {
+            logger.Warn($"User {User.Identity?.Name} attempted to upload empty file for device {address}");
+            return TypedResults.BadRequest("未选择文件");
+        }
+
+        try
+        {
+            // 生成安全的文件名（避免路径遍历攻击）
+            var fileName = Path.GetRandomFileName();
+            var uploadsFolder = Path.Combine(Environment.CurrentDirectory, $"{BITSTREAM_PATH}/{address}");
+
+            // 如果存在文件，则删除原文件再上传
+            if (Directory.Exists(uploadsFolder))
+            {
+                Directory.Delete(uploadsFolder, true);
+                logger.Info($"User {User.Identity?.Name} removed existing bitstream folder for device {address}");
+            }
+            Directory.CreateDirectory(uploadsFolder);
+
+            var filePath = Path.Combine(uploadsFolder, fileName);
+
+            using (var stream = new FileStream(filePath, FileMode.Create))
+            {
+                await file.CopyToAsync(stream);
+            }
+
+            logger.Info($"User {User.Identity?.Name} successfully uploaded bitstream for device {address}, file size: {file.Length} bytes");
+            return TypedResults.Ok(true);
+        }
+        catch (Exception ex)
+        {
+            logger.Error(ex, $"User {User.Identity?.Name} failed to upload bitstream for device {address}");
+            return TypedResults.InternalServerError(ex);
+        }
+    }
+
     /// <summary>
     /// 通过 JTAG 下载比特流文件到 FPGA 设备
     /// </summary>
     /// <param name="address">JTAG 设备地址</param>
     /// <param name="port">JTAG 设备端口</param>
-    /// <param name="bitstreamId">比特流ID</param>
+    /// <returns>下载结果</returns>
-    /// <returns>进度跟踪TaskID</returns>
     [HttpPost("DownloadBitstream")]
     [EnableCors("Users")]
-    [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]
+    [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
     [ProducesResponseType(typeof(string), StatusCodes.Status400BadRequest)]
     [ProducesResponseType(typeof(Exception), StatusCodes.Status500InternalServerError)]
     [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async ValueTask<IResult> DownloadBitstream(string address, int port, int bitstreamId, CancellationToken cancelToken)
+    public async ValueTask<IResult> DownloadBitstream(string address, int port)
     {
-        logger.Info($"User {User.Identity?.Name} initiating bitstream download to device {address}:{port} using bitstream ID: {bitstreamId}");
+        logger.Info($"User {User.Identity?.Name} initiating bitstream download to device {address}:{port}");
+
+        // 检查文件
+        var fileDir = Path.Combine(Environment.CurrentDirectory, $"{BITSTREAM_PATH}/{address}");
+        if (!Directory.Exists(fileDir))
+        {
+            logger.Warn($"User {User.Identity?.Name} attempted to download non-existent bitstream for device {address}");
+            return TypedResults.BadRequest("Empty bitstream, Please upload it first");
+        }
 
         try
         {
-            // 获取当前用户名
+            // 读取文件
-            var username = User.Identity?.Name;
+            var filePath = Directory.GetFiles(fileDir)[0];
-            if (string.IsNullOrEmpty(username))
+            logger.Info($"User {User.Identity?.Name} reading bitstream file: {filePath}");
+
+            using (var fileStream = System.IO.File.Open(filePath, System.IO.FileMode.Open))
             {
-                logger.Warn("Anonymous user attempted to download bitstream");
+                if (fileStream is null || fileStream.Length <= 0)
-                return TypedResults.Unauthorized();
+                {
+                    logger.Warn($"User {User.Identity?.Name} found invalid bitstream file for device {address}");
+                    return TypedResults.BadRequest("Wrong bitstream, Please upload it again");
                 }
 
-            // 从数据库获取用户信息
+                logger.Info($"User {User.Identity?.Name} processing bitstream file of size: {fileStream.Length} bytes");
-            using var db = new Database.AppDataConnection();
-            var userResult = db.GetUserByName(username);
-            if (!userResult.IsSuccessful || !userResult.Value.HasValue)
-            {
-                logger.Error($"User {username} not found in database");
-                return TypedResults.BadRequest("用户不存在");
-            }
 
-            var user = userResult.Value.Value;
-
-            // 从数据库获取比特流
-            var bitstreamResult = db.GetResourceById(bitstreamId);
-
-            if (!bitstreamResult.IsSuccessful)
-            {
-                logger.Error($"User {username} failed to get bitstream from database: {bitstreamResult.Error}");
-                return TypedResults.InternalServerError($"数据库查询失败: {bitstreamResult.Error?.Message}");
-            }
-
-            if (!bitstreamResult.Value.HasValue)
-            {
-                logger.Warn($"User {username} attempted to download non-existent bitstream ID: {bitstreamId}");
-                return TypedResults.BadRequest("比特流不存在");
-            }
-
-            var bitstream = bitstreamResult.Value.Value;
-
-            // 处理比特流数据
-            var fileBytes = bitstream.Data;
-            if (fileBytes == null || fileBytes.Length == 0)
-            {
-                logger.Warn($"User {username} found empty bitstream data for ID: {bitstreamId}");
-                return TypedResults.BadRequest("比特流数据为空，请重新上传");
-            }
-
-            logger.Info($"User {username} processing bitstream file of size: {fileBytes.Length} bytes");
-
-            // 定义进度跟踪
-            var (taskId, progress) = _tracker.CreateTask(cancelToken);
-            progress.Report(10);
-
-            _ = Task.Run(async () =>
-            {
                 // 定义缓冲区大小: 32KB
                 byte[] buffer = new byte[32 * 1024];
                 byte[] revBuffer = new byte[32 * 1024];
-                long totalBytesProcessed = 0;
+                long totalBytesRead = 0;
 
-                // 使用内存流处理文件
+                // 使用异步流读取文件
-                using (var inputStream = new MemoryStream(fileBytes))
+                using (var memoryStream = new MemoryStream())
-                using (var outputStream = new MemoryStream())
                 {
                     int bytesRead;
-                    while ((bytesRead = await inputStream.ReadAsync(buffer, 0, buffer.Length)) > 0)
+                    while ((bytesRead = await fileStream.ReadAsync(buffer, 0, buffer.Length)) > 0)
                     {
                         // 反转 32bits
                         var retBuffer = Common.Number.ReverseBytes(buffer, 4);
                         if (!retBuffer.IsSuccessful)
                         {
-                            logger.Error($"User {username} failed to reverse bytes: {retBuffer.Error}");
+                            logger.Error($"User {User.Identity?.Name} failed to reverse bytes: {retBuffer.Error}");
-                            progress.Error($"User {username} failed to reverse bytes: {retBuffer.Error}");
+                            return TypedResults.InternalServerError(retBuffer.Error);
-                            return;
                         }
                         revBuffer = retBuffer.Value;
 
@@ -219,38 +230,34 @@ public class JtagController : ControllerBase
                             revBuffer[i] = Common.Number.ReverseBits(revBuffer[i]);
                         }
 
-                        await outputStream.WriteAsync(revBuffer, 0, bytesRead);
+                        await memoryStream.WriteAsync(revBuffer, 0, bytesRead);
-                        totalBytesProcessed += bytesRead;
+                        totalBytesRead += bytesRead;
                     }
 
-                    // 获取处理后的数据
+                    // 将所有数据转换为字节数组（注意：如果文件非常大，可能不适合完全加载到内存）
-                    var processedBytes = outputStream.ToArray();
+                    var fileBytes = memoryStream.ToArray();
-                    logger.Info($"User {username} processed {totalBytesProcessed} bytes for device {address}");
+                    logger.Info($"User {User.Identity?.Name} processed {totalBytesRead} bytes for device {address}");
-
-                    progress.Report(20);
 
                     // 下载比特流
                     var jtagCtrl = new Peripherals.JtagClient.Jtag(address, port);
-                    var ret = await jtagCtrl.DownloadBitstream(processedBytes);
+                    var ret = await jtagCtrl.DownloadBitstream(fileBytes);
 
                     if (ret.IsSuccessful)
                     {
-                        logger.Info($"User {username} successfully downloaded bitstream '{bitstream.ResourceName}' to device {address}");
+                        logger.Info($"User {User.Identity?.Name} successfully downloaded bitstream to device {address}");
-                        progress.Finish();
+                        return TypedResults.Ok(ret.Value);
                     }
                     else
                     {
-                        logger.Error($"User {username} failed to download bitstream to device {address}: {ret.Error}");
+                        logger.Error($"User {User.Identity?.Name} failed to download bitstream to device {address}: {ret.Error}");
-                        progress.Error($"User {username} failed to download bitstream to device {address}: {ret.Error}");
+                        return TypedResults.InternalServerError(ret.Error);
+                    }
                 }
             }
-            });
-
-            return TypedResults.Ok(taskId);
         }
         catch (Exception ex)
         {
-            logger.Error(ex, $"User encountered exception while downloading bitstream to device {address}");
+            logger.Error(ex, $"User {User.Identity?.Name} encountered exception while downloading bitstream to device {address}");
             return TypedResults.InternalServerError(ex);
         }
     }

server/src/Controllers/LogicAnalyzerController.cs

@@ -45,22 +45,7 @@ public class LogicAnalyzerController : ControllerBase
         /// 全局触发模式
         /// </summary>
         public GlobalCaptureMode GlobalMode { get; set; }
-        /// <summary>
+
-        /// 捕获深度
-        /// </summary>
-        public int CaptureLength { get; set; } = 2048 * 32;
-        /// <summary>
-        /// 预采样深度
-        /// </summary>
-        public int PreCaptureLength { get; set; } = 2048;
-        /// <summary>
-        /// 有效通道
-        /// </summary>
-        public AnalyzerChannelDiv ChannelDiv { get; set; } = AnalyzerChannelDiv.EIGHT;
-        /// <summary>
-        /// 时钟分频系数
-        /// </summary>
-        public AnalyzerClockDiv ClockDiv { get; set; } = AnalyzerClockDiv.DIV1;
         /// <summary>
         /// 信号触发配置列表
         /// </summary>
@@ -92,7 +77,7 @@ public class LogicAnalyzerController : ControllerBase
                 return null;
 
             var board = boardRet.Value.Value;
-            return new Analyzer(board.IpAddr, board.Port, 0);
+            return new Analyzer(board.IpAddr, board.Port, 2);
         }
         catch (Exception ex)
         {
@@ -223,8 +208,8 @@ public class LogicAnalyzerController : ControllerBase
     {
         try
         {
-            if (signalIndex < 0 || signalIndex > 31)
+            if (signalIndex < 0 || signalIndex > 7)
-                return BadRequest("信号索引必须在0-31之间");
+                return BadRequest("信号索引必须在0-7之间");
 
             var analyzer = GetAnalyzer();
             if (analyzer == null)
@@ -246,50 +231,6 @@ public class LogicAnalyzerController : ControllerBase
         }
     }
 
-    /// <summary>
-    /// 设置深度、预采样深度、有效通道
-    /// </summary>
-    /// <param name="capture_length">深度</param>
-    /// <param name="pre_capture_length">预采样深度</param>
-    /// <param name="channel_div">有效通道(0-[1],1-[2],2-[4],3-[8],4-[16],5-[32])</param>
-    /// <param name="clock_div">采样时钟分频系数</param>
-    /// <returns>操作结果</returns>
-    [HttpPost("SetCaptureParams")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(bool), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> SetCaptureParams(int capture_length, int pre_capture_length, AnalyzerChannelDiv channel_div, AnalyzerClockDiv clock_div)
-    {
-        try
-        {
-            //DDR深度为 32'h01000000 - 32'h0FFFFFFF
-            if (capture_length < 0 || capture_length > 0x10000000 - 0x01000000)
-                return BadRequest("采样深度设置错误");
-            if (pre_capture_length < 0 || pre_capture_length >= capture_length)
-                return BadRequest("预采样深度必须小于捕获深度");
-
-            var analyzer = GetAnalyzer();
-            if (analyzer == null)
-                return BadRequest("用户未绑定有效的实验板");
-
-            var result = await analyzer.SetCaptureParams(capture_length, pre_capture_length, channel_div, clock_div);
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"设置深度、预采样深度、有效通道、时钟分频失败: {result.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "设置深度、预采样深度、有效通道、时钟分频失败");
-            }
-
-            return Ok(result.Value);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "设置深度、预采样深度、有效通道、时钟分频失败时发生异常");
-            return StatusCode(StatusCodes.Status500InternalServerError, "操作失败，请稍后重试");
-        }
-    }
-
     /// <summary>
     /// 批量配置捕获参数
     /// </summary>
@@ -323,8 +264,8 @@ public class LogicAnalyzerController : ControllerBase
             // 设置信号触发模式
             foreach (var signalConfig in config.SignalConfigs)
             {
-                if (signalConfig.SignalIndex < 0 || signalConfig.SignalIndex > 31)
+                if (signalConfig.SignalIndex < 0 || signalConfig.SignalIndex > 7)
-                    return BadRequest($"信号索引{signalConfig.SignalIndex}超出范围0-31");
+                    return BadRequest($"信号索引{signalConfig.SignalIndex}超出范围0-7");
 
                 var signalResult = await analyzer.SetSignalTrigMode(
                     signalConfig.SignalIndex, signalConfig.Operator, signalConfig.Value);
@@ -335,14 +276,6 @@ public class LogicAnalyzerController : ControllerBase
                         $"设置信号{signalConfig.SignalIndex}触发模式失败");
                 }
             }
-            // 设置深度、预采样深度、有效通道
-            var paramsResult = await analyzer.SetCaptureParams(
-                config.CaptureLength, config.PreCaptureLength, config.ChannelDiv, config.ClockDiv);
-            if (!paramsResult.IsSuccessful)
-            {
-                logger.Error($"设置深度、预采样深度、有效通道失败: {paramsResult.Error}");
-                return StatusCode(StatusCodes.Status500InternalServerError, "设置深度、预采样深度、有效通道失败");
-            }
 
             return Ok(true);
         }
@@ -397,7 +330,7 @@ public class LogicAnalyzerController : ControllerBase
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
     [ProducesResponseType(StatusCodes.Status500InternalServerError)]
     [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    public async Task<IActionResult> GetCaptureData(int capture_length = 2048 * 32)
+    public async Task<IActionResult> GetCaptureData()
     {
         try
         {
@@ -405,7 +338,7 @@ public class LogicAnalyzerController : ControllerBase
             if (analyzer == null)
                 return BadRequest("用户未绑定有效的实验板");
 
-            var result = await analyzer.ReadCaptureData(capture_length);
+            var result = await analyzer.ReadCaptureData();
             if (!result.IsSuccessful)
             {
                 logger.Error($"读取捕获数据失败: {result.Error}");

server/src/Controllers/NetConfigController.cs

@@ -19,6 +19,7 @@ public class NetConfigController : ControllerBase
     // 固定的实验板IP,端口,MAC地址
     private const string BOARD_IP = "169.254.109.0";
     private const int BOARD_PORT = 1234;
+    private const string BOARD_MAC = "12:34:56:78:9a:bc";
     
     // 本机网络信息
     private readonly IPAddress _localIP;
@@ -129,7 +130,7 @@ public class NetConfigController : ControllerBase
     {
         try
         {
-            return await ArpClient.UpdateArpEntryAsync(BOARD_IP);
+            return await Arp.CheckOrAddAsync(BOARD_IP, BOARD_MAC, _localInterface);
         }
         catch (Exception ex)
         {

server/src/Controllers/ResourceController.cs

@@ -1,377 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Cors;
-using Microsoft.AspNetCore.Mvc;
-using DotNext;
-using Database;
-
-namespace server.Controllers;
-
-/// <summary>
-/// 资源控制器 - 提供统一的资源管理API
-/// </summary>
-[ApiController]
-[Route("api/[controller]")]
-public class ResourceController : ControllerBase
-{
-    private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-
-    /// <summary>
-    /// 资源信息类
-    /// </summary>
-    public class ResourceInfo
-    {
-        /// <summary>
-        /// 资源ID
-        /// </summary>
-        public int ID { get; set; }
-
-        /// <summary>
-        /// 资源名称
-        /// </summary>
-        public required string Name { get; set; }
-
-        /// <summary>
-        /// 资源类型
-        /// </summary>
-        public required string Type { get; set; }
-
-        /// <summary>
-        /// 资源用途（template/user）
-        /// </summary>
-        public required string Purpose { get; set; }
-
-        /// <summary>
-        /// 上传时间
-        /// </summary>
-        public DateTime UploadTime { get; set; }
-
-        /// <summary>
-        /// 所属实验ID（可选）
-        /// </summary>
-        public string? ExamID { get; set; }
-
-        /// <summary>
-        /// MIME类型
-        /// </summary>
-        public string? MimeType { get; set; }
-    }
-
-    /// <summary>
-    /// 添加资源请求类
-    /// </summary>
-    public class AddResourceRequest
-    {
-        /// <summary>
-        /// 资源类型
-        /// </summary>
-        public required string ResourceType { get; set; }
-
-        /// <summary>
-        /// 资源用途（template/user）
-        /// </summary>
-        public required string ResourcePurpose { get; set; }
-
-        /// <summary>
-        /// 所属实验ID（可选）
-        /// </summary>
-        public string? ExamID { get; set; }
-    }
-
-    /// <summary>
-    /// 添加资源（文件上传）
-    /// </summary>
-    /// <param name="request">添加资源请求</param>
-    /// <param name="file">资源文件</param>
-    /// <returns>添加结果</returns>
-    [Authorize]
-    [HttpPost]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(ResourceInfo), StatusCodes.Status201Created)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    public async Task<IActionResult> AddResource([FromForm] AddResourceRequest request, IFormFile file)
-    {
-        if (string.IsNullOrWhiteSpace(request.ResourceType) || string.IsNullOrWhiteSpace(request.ResourcePurpose) || file == null)
-            return BadRequest("资源类型、资源用途和文件不能为空");
-
-        // 验证资源用途
-        if (request.ResourcePurpose != Resource.ResourcePurposes.Template && request.ResourcePurpose != Resource.ResourcePurposes.User)
-            return BadRequest($"无效的资源用途: {request.ResourcePurpose}");
-
-        // 模板资源需要管理员权限
-        if (request.ResourcePurpose == Resource.ResourcePurposes.Template && !User.IsInRole("Admin"))
-            return Forbid("只有管理员可以添加模板资源");
-
-        try
-        {
-            using var db = new Database.AppDataConnection();
-            
-            // 获取当前用户ID
-            var userName = User.Identity?.Name;
-            if (string.IsNullOrEmpty(userName))
-                return Unauthorized("无法获取用户信息");
-
-            var userResult = db.GetUserByName(userName);
-            if (!userResult.IsSuccessful || !userResult.Value.HasValue)
-                return Unauthorized("用户不存在");
-
-            var user = userResult.Value.Value;
-
-            // 读取文件数据
-            using var memoryStream = new MemoryStream();
-            await file.CopyToAsync(memoryStream);
-            var fileData = memoryStream.ToArray();
-
-            var result = db.AddResource(user.ID, request.ResourceType, request.ResourcePurpose, file.FileName, fileData, request.ExamID);
-
-            if (!result.IsSuccessful)
-            {
-                if (result.Error.Message.Contains("不存在"))
-                    return NotFound(result.Error.Message);
-                
-                logger.Error($"添加资源时出错: {result.Error.Message}");
-                return StatusCode(StatusCodes.Status500InternalServerError, $"添加资源失败: {result.Error.Message}");
-            }
-
-            var resource = result.Value;
-            var resourceInfo = new ResourceInfo
-            {
-                ID = resource.ID,
-                Name = resource.ResourceName,
-                Type = resource.ResourceType,
-                Purpose = resource.ResourcePurpose,
-                UploadTime = resource.UploadTime,
-                ExamID = resource.ExamID,
-                MimeType = resource.MimeType
-            };
-
-            logger.Info($"成功添加资源: {request.ResourceType}/{request.ResourcePurpose}/{file.FileName}");
-            return CreatedAtAction(nameof(GetResourceById), new { resourceId = resource.ID }, resourceInfo);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"添加资源 {request.ResourceType}/{request.ResourcePurpose}/{file.FileName} 时出错: {ex.Message}");
-            return StatusCode(StatusCodes.Status500InternalServerError, $"添加资源失败: {ex.Message}");
-        }
-    }
-
-    /// <summary>
-    /// 获取资源列表
-    /// </summary>
-    /// <param name="examId">实验ID（可选）</param>
-    /// <param name="resourceType">资源类型（可选）</param>
-    /// <param name="resourcePurpose">资源用途（可选）</param>
-    /// <returns>资源列表</returns>
-    [Authorize]
-    [HttpGet]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(ResourceInfo[]), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    public IActionResult GetResourceList([FromQuery] string? examId = null, [FromQuery] string? resourceType = null, [FromQuery] string? resourcePurpose = null)
-    {
-        try
-        {
-            using var db = new Database.AppDataConnection();
-            
-            // 获取当前用户ID
-            var userName = User.Identity?.Name;
-            if (string.IsNullOrEmpty(userName))
-                return Unauthorized("无法获取用户信息");
-
-            var userResult = db.GetUserByName(userName);
-            if (!userResult.IsSuccessful || !userResult.Value.HasValue)
-                return Unauthorized("用户不存在");
-
-            var user = userResult.Value.Value;
-
-            // 普通用户只能查看自己的资源和模板资源
-            Guid? userId = null;
-            if (!User.IsInRole("Admin"))
-            {
-                // 如果指定了用户资源用途，则只查看自己的资源
-                if (resourcePurpose == Resource.ResourcePurposes.User)
-                {
-                    userId = user.ID;
-                }
-                // 如果指定了模板资源用途，则不限制用户ID
-                else if (resourcePurpose == Resource.ResourcePurposes.Template)
-                {
-                    userId = null;
-                }
-                // 如果没有指定用途，则查看自己的用户资源和所有模板资源
-                else
-                {
-                    // 这种情况下需要分别查询并合并结果
-                    var userResourcesResult = db.GetFullResourceList(examId, resourceType, Resource.ResourcePurposes.User, user.ID);
-                    var templateResourcesResult = db.GetFullResourceList(examId, resourceType, Resource.ResourcePurposes.Template, null);
-                    
-                    if (!userResourcesResult.IsSuccessful || !templateResourcesResult.IsSuccessful)
-                    {
-                        logger.Error($"获取资源列表时出错");
-                        return StatusCode(StatusCodes.Status500InternalServerError, "获取资源列表失败");
-                    }
-
-                    var allResources = userResourcesResult.Value.Concat(templateResourcesResult.Value)
-                        .OrderByDescending(r => r.UploadTime);
-                    var mergedResourceInfos = allResources.Select(r => new ResourceInfo
-                    {
-                        ID = r.ID,
-                        Name = r.ResourceName,
-                        Type = r.ResourceType,
-                        Purpose = r.ResourcePurpose,
-                        UploadTime = r.UploadTime,
-                        ExamID = r.ExamID,
-                        MimeType = r.MimeType
-                    }).ToArray();
-
-                    logger.Info($"成功获取资源列表，共 {mergedResourceInfos.Length} 个资源");
-                    return Ok(mergedResourceInfos);
-                }
-            }
-
-            var result = db.GetFullResourceList(examId, resourceType, resourcePurpose, userId);
-
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"获取资源列表时出错: {result.Error.Message}");
-                return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源列表失败: {result.Error.Message}");
-            }
-
-            var resources = result.Value.Select(r => new ResourceInfo
-            {
-                ID = r.ID,
-                Name = r.ResourceName,
-                Type = r.ResourceType,
-                Purpose = r.ResourcePurpose,
-                UploadTime = r.UploadTime,
-                ExamID = r.ExamID,
-                MimeType = r.MimeType
-            }).ToArray();
-
-            logger.Info($"成功获取资源列表，共 {resources.Length} 个资源");
-            return Ok(resources);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"获取资源列表时出错: {ex.Message}");
-            return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源列表失败: {ex.Message}");
-        }
-    }
-
-    /// <summary>
-    /// 根据资源ID下载资源
-    /// </summary>
-    /// <param name="resourceId">资源ID</param>
-    /// <returns>资源文件</returns>
-    [HttpGet("{resourceId}")]
-    [EnableCors("Users")]
-    [ProducesResponseType(typeof(FileResult), StatusCodes.Status200OK)]
-    [ProducesResponseType(StatusCodes.Status400BadRequest)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    public IActionResult GetResourceById(int resourceId)
-    {
-        try
-        {
-            using var db = new Database.AppDataConnection();
-            var result = db.GetResourceById(resourceId);
-
-            if (!result.IsSuccessful)
-            {
-                logger.Error($"获取资源时出错: {result.Error.Message}");
-                return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源失败: {result.Error.Message}");
-            }
-
-            if (!result.Value.HasValue)
-            {
-                logger.Warn($"资源不存在: {resourceId}");
-                return NotFound($"资源 {resourceId} 不存在");
-            }
-
-            var resource = result.Value.Value;
-            logger.Info($"成功获取资源: {resourceId} ({resource.ResourceName})");
-            return File(resource.Data, resource.MimeType ?? "application/octet-stream", resource.ResourceName);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"获取资源 {resourceId} 时出错: {ex.Message}");
-            return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源失败: {ex.Message}");
-        }
-    }
-
-    /// <summary>
-    /// 删除资源
-    /// </summary>
-    /// <param name="resourceId">资源ID</param>
-    /// <returns>删除结果</returns>
-    [Authorize]
-    [HttpDelete("{resourceId}")]
-    [EnableCors("Users")]
-    [ProducesResponseType(StatusCodes.Status204NoContent)]
-    [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-    [ProducesResponseType(StatusCodes.Status403Forbidden)]
-    [ProducesResponseType(StatusCodes.Status404NotFound)]
-    [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-    public IActionResult DeleteResource(int resourceId)
-    {
-        try
-        {
-            using var db = new Database.AppDataConnection();
-            
-            // 获取当前用户信息
-            var userName = User.Identity?.Name;
-            if (string.IsNullOrEmpty(userName))
-                return Unauthorized("无法获取用户信息");
-
-            var userResult = db.GetUserByName(userName);
-            if (!userResult.IsSuccessful || !userResult.Value.HasValue)
-                return Unauthorized("用户不存在");
-
-            var user = userResult.Value.Value;
-
-            // 先获取资源信息以验证权限
-            var resourceResult = db.GetResourceById(resourceId);
-            if (!resourceResult.IsSuccessful)
-            {
-                logger.Error($"获取资源时出错: {resourceResult.Error.Message}");
-                return StatusCode(StatusCodes.Status500InternalServerError, $"获取资源失败: {resourceResult.Error.Message}");
-            }
-
-            if (!resourceResult.Value.HasValue)
-            {
-                logger.Warn($"资源不存在: {resourceId}");
-                return NotFound($"资源 {resourceId} 不存在");
-            }
-
-            var resource = resourceResult.Value.Value;
-
-            // 权限检查：管理员可以删除所有资源，普通用户只能删除自己的用户资源
-            if (!User.IsInRole("Admin"))
-            {
-                if (resource.ResourcePurpose == Resource.ResourcePurposes.Template)
-                    return Forbid("普通用户不能删除模板资源");
-                
-                if (resource.UserID != user.ID)
-                    return Forbid("只能删除自己的资源");
-            }
-
-            var deleteResult = db.DeleteResource(resourceId);
-            if (!deleteResult.IsSuccessful)
-            {
-                logger.Error($"删除资源时出错: {deleteResult.Error.Message}");
-                return StatusCode(StatusCodes.Status500InternalServerError, $"删除资源失败: {deleteResult.Error.Message}");
-            }
-
-            logger.Info($"成功删除资源: {resourceId} ({resource.ResourceName})");
-            return NoContent();
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"删除资源 {resourceId} 时出错: {ex.Message}");
-            return StatusCode(StatusCodes.Status500InternalServerError, $"删除资源失败: {ex.Message}");
-        }
-    }
-}

server/src/Controllers/VideoStreamController.cs

@@ -148,10 +148,10 @@ public class VideoStreamController : ControllerBase
                 FrameWidth = _videoStreamService.FrameWidth,
                 FrameHeight = _videoStreamService.FrameHeight,
                 Format = "MJPEG",
-                HtmlUrl = $"http://{Global.localhost}:{_videoStreamService.ServerPort}/video-feed.html",
+                HtmlUrl = $"http://localhost:{_videoStreamService.ServerPort}/video-feed.html",
-                MjpegUrl = $"http://{Global.localhost}:{_videoStreamService.ServerPort}/video-stream",
+                MjpegUrl = $"http://localhost:{_videoStreamService.ServerPort}/video-stream",
-                SnapshotUrl = $"http://{Global.localhost}:{_videoStreamService.ServerPort}/snapshot",
+                SnapshotUrl = $"http://localhost:{_videoStreamService.ServerPort}/snapshot",
-                UsbCameraUrl = $"http://{Global.localhost}:{_videoStreamService.ServerPort}/usb-camera"
+                UsbCameraUrl = $"http://localhost:{_videoStreamService.ServerPort}/usb-camera"
             };
             return TypedResults.Ok(result);
         }
@@ -267,7 +267,7 @@ public class VideoStreamController : ControllerBase
             using (var httpClient = new HttpClient())
             {
                 httpClient.Timeout = TimeSpan.FromSeconds(2); // 设置较短的超时时间
-                var response = await httpClient.GetAsync($"http://{Global.localhost}:{_videoStreamService.ServerPort}/");
+                var response = await httpClient.GetAsync($"http://localhost:{_videoStreamService.ServerPort}/");
 
                 // 只要能连接上就认为成功，不管返回状态
                 isConnected = response.IsSuccessStatusCode;

server/src/Database.cs

@@ -150,191 +150,6 @@ public class Board
     }
 }
 
-/// <summary>
-/// 实验类，表示实验信息
-/// </summary>
-public class Exam
-{
-    /// <summary>
-    /// 实验的唯一标识符
-    /// </summary>
-    [PrimaryKey]
-    public required string ID { get; set; }
-
-    /// <summary>
-    /// 实验名称
-    /// </summary>
-    [NotNull]
-    public required string Name { get; set; }
-
-    /// <summary>
-    /// 实验描述
-    /// </summary>
-    [NotNull]
-    public required string Description { get; set; }
-
-    /// <summary>
-    /// 实验创建时间
-    /// </summary>
-    [NotNull]
-    public DateTime CreatedTime { get; set; } = DateTime.Now;
-
-    /// <summary>
-    /// 实验最后更新时间
-    /// </summary>
-    [NotNull]
-    public DateTime UpdatedTime { get; set; } = DateTime.Now;
-
-    /// <summary>
-    /// 实验标签（以逗号分隔的字符串）
-    /// </summary>
-    [NotNull]
-    public string Tags { get; set; } = "";
-
-    /// <summary>
-    /// 实验难度（1-5，1为最简单）
-    /// </summary>
-    [NotNull]
-    public int Difficulty { get; set; } = 1;
-
-    /// <summary>
-    /// 普通用户是否可见
-    /// </summary>
-    [NotNull]
-    public bool IsVisibleToUsers { get; set; } = true;
-
-    /// <summary>
-    /// 获取标签列表
-    /// </summary>
-    /// <returns>标签数组</returns>
-    public string[] GetTagsList()
-    {
-        if (string.IsNullOrWhiteSpace(Tags))
-            return Array.Empty<string>();
-        
-        return Tags.Split(',', StringSplitOptions.RemoveEmptyEntries)
-                   .Select(tag => tag.Trim())
-                   .Where(tag => !string.IsNullOrEmpty(tag))
-                   .ToArray();
-    }
-
-    /// <summary>
-    /// 设置标签列表
-    /// </summary>
-    /// <param name="tags">标签数组</param>
-    public void SetTagsList(string[] tags)
-    {
-        Tags = string.Join(",", tags.Where(tag => !string.IsNullOrWhiteSpace(tag)).Select(tag => tag.Trim()));
-    }
-}
-
-/// <summary>
-/// 资源类，统一管理实验资源、用户比特流等各类资源
-/// </summary>
-public class Resource
-{
-    /// <summary>
-    /// 资源的唯一标识符
-    /// </summary>
-    [PrimaryKey, Identity]
-    public int ID { get; set; }
-
-    /// <summary>
-    /// 上传资源的用户ID
-    /// </summary>
-    [NotNull]
-    public required Guid UserID { get; set; }
-
-    /// <summary>
-    /// 所属实验ID（可选，如果不属于特定实验则为空）
-    /// </summary>
-    [Nullable]
-    public string? ExamID { get; set; }
-
-    /// <summary>
-    /// 资源类型（images, markdown, bitstream, diagram, project等）
-    /// </summary>
-    [NotNull]
-    public required string ResourceType { get; set; }
-
-    /// <summary>
-    /// 资源用途：template（模板）或 user（用户上传）
-    /// </summary>
-    [NotNull]
-    public required string ResourcePurpose { get; set; }
-
-    /// <summary>
-    /// 资源名称（包含文件扩展名）
-    /// </summary>
-    [NotNull]
-    public required string ResourceName { get; set; }
-
-    /// <summary>
-    /// 资源的二进制数据
-    /// </summary>
-    [NotNull]
-    public required byte[] Data { get; set; }
-
-    /// <summary>
-    /// 资源创建/上传时间
-    /// </summary>
-    [NotNull]
-    public DateTime UploadTime { get; set; } = DateTime.Now;
-
-    /// <summary>
-    /// 资源的MIME类型
-    /// </summary>
-    [NotNull]
-    public string MimeType { get; set; } = "application/octet-stream";
-
-    /// <summary>
-    /// 资源类型枚举
-    /// </summary>
-    public static class ResourceTypes
-    {
-        /// <summary>
-        /// 图片资源类型
-        /// </summary>
-        public const string Images = "images";
-        
-        /// <summary>
-        /// Markdown文档资源类型
-        /// </summary>
-        public const string Markdown = "markdown";
-        
-        /// <summary>
-        /// 比特流文件资源类型
-        /// </summary>
-        public const string Bitstream = "bitstream";
-        
-        /// <summary>
-        /// 原理图资源类型
-        /// </summary>
-        public const string Diagram = "diagram";
-        
-        /// <summary>
-        /// 项目文件资源类型
-        /// </summary>
-        public const string Project = "project";
-    }
-
-    /// <summary>
-    /// 资源用途枚举
-    /// </summary>
-    public static class ResourcePurposes
-    {
-        /// <summary>
-        /// 模板资源，通常由管理员上传，供用户参考
-        /// </summary>
-        public const string Template = "template";
-        
-        /// <summary>
-        /// 用户上传的资源
-        /// </summary>
-        public const string User = "user";
-    }
-}
-
 /// <summary>
 /// 应用程序数据连接类，用于与数据库交互
 /// </summary>
@@ -382,8 +197,6 @@ public class AppDataConnection : DataConnection
         logger.Info("正在创建数据库表...");
         this.CreateTable<User>();
         this.CreateTable<Board>();
-        this.CreateTable<Exam>();
-        this.CreateTable<Resource>();
         logger.Info("数据库表创建完成");
     }
 
@@ -395,8 +208,6 @@ public class AppDataConnection : DataConnection
         logger.Warn("正在删除所有数据库表...");
         this.DropTable<User>();
         this.DropTable<Board>();
-        this.DropTable<Exam>();
-        this.DropTable<Resource>();
         logger.Warn("所有数据库表已删除");
     }
 
@@ -715,31 +526,6 @@ public class AppDataConnection : DataConnection
         return new(boards[0]);
     }
 
-    /// <summary>
-    /// 根据用户名获取实验板信息
-    /// </summary>
-    /// <param name="userName">用户名</param>
-    /// <returns>包含实验板信息的结果，如果未找到则返回空</returns>
-    public Result<Optional<Board>> GetBoardByUserName(string userName)
-    {
-        var boards = this.BoardTable.Where(board => board.OccupiedUserName == userName).ToArray();
-
-        if (boards.Length > 1)
-        {
-            logger.Error($"数据库中存在多个相同用户名的实验板: {userName}");
-            return new(new Exception($"数据库中存在多个相同用户名的实验板: {userName}"));
-        }
-
-        if (boards.Length == 0)
-        {
-            logger.Info($"未找到用户名对应的实验板: {userName}");
-            return new(Optional<Board>.None);
-        }
-
-        logger.Debug($"成功获取实验板信息: {userName}");
-        return new(boards[0]);
-    }
-
     /// <summary>
     /// 获取所有实验板信息
     /// </summary>
@@ -849,418 +635,4 @@ public class AppDataConnection : DataConnection
     /// FPGA 板子表
     /// </summary>
     public ITable<Board> BoardTable => this.GetTable<Board>();
-
-    /// <summary>
-    /// 实验表
-    /// </summary>
-    public ITable<Exam> ExamTable => this.GetTable<Exam>();
-
-    /// <summary>
-    /// 资源表（统一管理实验资源、用户比特流等）
-    /// </summary>
-    public ITable<Resource> ResourceTable => this.GetTable<Resource>();
-
-    /// <summary>
-    /// 创建新实验
-    /// </summary>
-    /// <param name="id">实验ID</param>
-    /// <param name="name">实验名称</param>
-    /// <param name="description">实验描述</param>
-    /// <param name="tags">实验标签</param>
-    /// <param name="difficulty">实验难度</param>
-    /// <param name="isVisibleToUsers">普通用户是否可见</param>
-    /// <returns>创建的实验</returns>
-    public Result<Exam> CreateExam(string id, string name, string description, string[]? tags = null, int difficulty = 1, bool isVisibleToUsers = true)
-    {
-        try
-        {
-            // 检查实验ID是否已存在
-            var existingExam = this.ExamTable.Where(e => e.ID == id).FirstOrDefault();
-            if (existingExam != null)
-            {
-                logger.Error($"实验ID已存在: {id}");
-                return new(new Exception($"实验ID已存在: {id}"));
-            }
-
-            var exam = new Exam
-            {
-                ID = id,
-                Name = name,
-                Description = description,
-                Difficulty = Math.Max(1, Math.Min(5, difficulty)),
-                IsVisibleToUsers = isVisibleToUsers,
-                CreatedTime = DateTime.Now,
-                UpdatedTime = DateTime.Now
-            };
-
-            if (tags != null)
-            {
-                exam.SetTagsList(tags);
-            }
-
-            this.Insert(exam);
-            logger.Info($"新实验已创建: {id} ({name})");
-            return new(exam);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"创建实验时出错: {ex.Message}");
-            return new(ex);
-        }
-    }
-
-    /// <summary>
-    /// 更新实验信息
-    /// </summary>
-    /// <param name="id">实验ID</param>
-    /// <param name="name">实验名称</param>
-    /// <param name="description">实验描述</param>
-    /// <param name="tags">实验标签</param>
-    /// <param name="difficulty">实验难度</param>
-    /// <param name="isVisibleToUsers">普通用户是否可见</param>
-    /// <returns>更新的记录数</returns>
-    public Result<int> UpdateExam(string id, string? name = null, string? description = null, string[]? tags = null, int? difficulty = null, bool? isVisibleToUsers = null)
-    {
-        try
-        {
-            int result = 0;
-            
-            if (name != null)
-            {
-                result += this.ExamTable.Where(e => e.ID == id).Set(e => e.Name, name).Update();
-            }
-            if (description != null)
-            {
-                result += this.ExamTable.Where(e => e.ID == id).Set(e => e.Description, description).Update();
-            }
-            if (tags != null)
-            {
-                var tagsString = string.Join(",", tags.Where(tag => !string.IsNullOrWhiteSpace(tag)).Select(tag => tag.Trim()));
-                result += this.ExamTable.Where(e => e.ID == id).Set(e => e.Tags, tagsString).Update();
-            }
-            if (difficulty.HasValue)
-            {
-                result += this.ExamTable.Where(e => e.ID == id).Set(e => e.Difficulty, Math.Max(1, Math.Min(5, difficulty.Value))).Update();
-            }
-            if (isVisibleToUsers.HasValue)
-            {
-                result += this.ExamTable.Where(e => e.ID == id).Set(e => e.IsVisibleToUsers, isVisibleToUsers.Value).Update();
-            }
-            
-            // 更新时间
-            this.ExamTable.Where(e => e.ID == id).Set(e => e.UpdatedTime, DateTime.Now).Update();
-            
-            logger.Info($"实验已更新: {id}，更新记录数: {result}");
-            return new(result);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"更新实验时出错: {ex.Message}");
-            return new(ex);
-        }
-    }
-
-    /// <summary>
-    /// 添加资源
-    /// </summary>
-    /// <param name="userId">上传用户ID</param>
-    /// <param name="resourceType">资源类型</param>
-    /// <param name="resourcePurpose">资源用途（template 或 user）</param>
-    /// <param name="resourceName">资源名称</param>
-    /// <param name="data">资源二进制数据</param>
-    /// <param name="examId">所属实验ID（可选）</param>
-    /// <param name="mimeType">MIME类型（可选，将根据文件扩展名自动确定）</param>
-    /// <returns>创建的资源</returns>
-    public Result<Resource> AddResource(Guid userId, string resourceType, string resourcePurpose, string resourceName, byte[] data, string? examId = null, string? mimeType = null)
-    {
-        try
-        {
-            // 验证用户是否存在
-            var user = this.UserTable.Where(u => u.ID == userId).FirstOrDefault();
-            if (user == null)
-            {
-                logger.Error($"用户不存在: {userId}");
-                return new(new Exception($"用户不存在: {userId}"));
-            }
-
-            // 如果指定了实验ID，验证实验是否存在
-            if (!string.IsNullOrEmpty(examId))
-            {
-                var exam = this.ExamTable.Where(e => e.ID == examId).FirstOrDefault();
-                if (exam == null)
-                {
-                    logger.Error($"实验不存在: {examId}");
-                    return new(new Exception($"实验不存在: {examId}"));
-                }
-            }
-
-            // 验证资源用途
-            if (resourcePurpose != Resource.ResourcePurposes.Template && resourcePurpose != Resource.ResourcePurposes.User)
-            {
-                logger.Error($"无效的资源用途: {resourcePurpose}");
-                return new(new Exception($"无效的资源用途: {resourcePurpose}"));
-            }
-
-            // 如果未指定MIME类型，根据文件扩展名自动确定
-            if (string.IsNullOrEmpty(mimeType))
-            {
-                var extension = Path.GetExtension(resourceName).ToLowerInvariant();
-                mimeType = GetMimeTypeFromExtension(extension, resourceName);
-            }
-
-            var resource = new Resource
-            {
-                UserID = userId,
-                ExamID = examId,
-                ResourceType = resourceType,
-                ResourcePurpose = resourcePurpose,
-                ResourceName = resourceName,
-                Data = data,
-                MimeType = mimeType,
-                UploadTime = DateTime.Now
-            };
-
-            var insertedId = this.InsertWithIdentity(resource);
-            resource.ID = Convert.ToInt32(insertedId);
-            
-            logger.Info($"新资源已添加: {userId}/{resourceType}/{resourcePurpose}/{resourceName} ({data.Length} bytes)" + 
-                       (examId != null ? $" [实验: {examId}]" : "") + $" [ID: {resource.ID}]");
-            return new(resource);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"添加资源时出错: {ex.Message}");
-            return new(ex);
-        }
-    }
-
-    /// <summary>
-    /// 获取资源信息列表（返回ID和名称）
-    /// <param name="resourceType">资源类型</param>
-    /// <param name="examId">实验ID（可选）</param>
-    /// <param name="resourcePurpose">资源用途（可选）</param>
-    /// <param name="userId">用户ID（可选）</param>
-    /// </summary>
-    /// <returns>资源信息列表</returns>
-    public Result<(int ID, string Name)[]> GetResourceList(string resourceType, string? examId = null, string? resourcePurpose = null, Guid? userId = null)
-    {
-        try
-        {
-            var query = this.ResourceTable.Where(r => r.ResourceType == resourceType);
-
-            if (examId != null)
-            {
-                query = query.Where(r => r.ExamID == examId);
-            }
-
-            if (resourcePurpose != null)
-            {
-                query = query.Where(r => r.ResourcePurpose == resourcePurpose);
-            }
-
-            if (userId != null)
-            {
-                query = query.Where(r => r.UserID == userId);
-            }
-
-            var resources = query
-                .Select(r => new { r.ID, r.ResourceName })
-                .ToArray();
-
-            var result = resources.Select(r => (r.ID, r.ResourceName)).ToArray();
-            logger.Info($"获取资源列表: {resourceType}" + 
-                       (examId != null ? $"/{examId}" : "") +
-                       (resourcePurpose != null ? $"/{resourcePurpose}" : "") +
-                       (userId != null ? $"/{userId}" : "") +
-                       $"，共 {result.Length} 个资源");
-            return new(result);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"获取资源列表时出错: {ex.Message}");
-            return new(ex);
-        }
-    }
-
-    /// <summary>
-    /// 获取完整的资源列表
-    /// </summary>
-    /// <param name="examId">实验ID（可选）</param>
-    /// <param name="resourceType">资源类型（可选）</param>
-    /// <param name="resourcePurpose">资源用途（可选）</param>
-    /// <param name="userId">用户ID（可选）</param>
-    /// <returns>完整的资源对象列表</returns>
-    public Result<List<Resource>> GetFullResourceList(string? examId = null, string? resourceType = null, string? resourcePurpose = null, Guid? userId = null)
-    {
-        try
-        {
-            var query = this.ResourceTable.AsQueryable();
-
-            if (examId != null)
-            {
-                query = query.Where(r => r.ExamID == examId);
-            }
-
-            if (resourceType != null)
-            {
-                query = query.Where(r => r.ResourceType == resourceType);
-            }
-
-            if (resourcePurpose != null)
-            {
-                query = query.Where(r => r.ResourcePurpose == resourcePurpose);
-            }
-
-            if (userId != null)
-            {
-                query = query.Where(r => r.UserID == userId);
-            }
-
-            var resources = query.OrderByDescending(r => r.UploadTime).ToList();
-            logger.Info($"获取完整资源列表" + 
-                       (examId != null ? $" [实验: {examId}]" : "") +
-                       (resourceType != null ? $" [类型: {resourceType}]" : "") +
-                       (resourcePurpose != null ? $" [用途: {resourcePurpose}]" : "") +
-                       (userId != null ? $" [用户: {userId}]" : "") +
-                       $"，共 {resources.Count} 个资源");
-            return new(resources);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"获取完整资源列表时出错: {ex.Message}");
-            return new(ex);
-        }
-    }
-
-    /// <summary>
-    /// 根据资源ID获取资源
-    /// </summary>
-    /// <param name="resourceId">资源ID</param>
-    /// <returns>资源数据</returns>
-    public Result<Optional<Resource>> GetResourceById(int resourceId)
-    {
-        try
-        {
-            var resource = this.ResourceTable.Where(r => r.ID == resourceId).FirstOrDefault();
-            
-            if (resource == null)
-            {
-                logger.Info($"未找到资源: {resourceId}");
-                return new(Optional<Resource>.None);
-            }
-
-            logger.Info($"成功获取资源: {resourceId} ({resource.ResourceName})");
-            return new(resource);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"获取资源时出错: {ex.Message}");
-            return new(ex);
-        }
-    }
-
-    /// <summary>
-    /// 删除资源
-    /// </summary>
-    /// <param name="resourceId">资源ID</param>
-    /// <returns>删除的记录数</returns>
-    public Result<int> DeleteResource(int resourceId)
-    {
-        try
-        {
-            var result = this.ResourceTable.Where(r => r.ID == resourceId).Delete();
-            logger.Info($"资源已删除: {resourceId}，删除记录数: {result}");
-            return new(result);
-        }
-        catch (Exception ex)
-        {
-            logger.Error($"删除资源时出错: {ex.Message}");
-            return new(ex);
-        }
-    }
-
-    /// <summary>
-    /// 根据文件扩展名获取MIME类型
-    /// </summary>
-    /// <param name="extension">文件扩展名</param>
-    /// <param name="fileName">文件名（可选，用于特殊文件判断）</param>
-    /// <returns>MIME类型</returns>
-    private string GetMimeTypeFromExtension(string extension, string fileName = "")
-    {
-        // 特殊文件名处理
-        if (!string.IsNullOrEmpty(fileName) && fileName.Equals("diagram.json", StringComparison.OrdinalIgnoreCase))
-        {
-            return "application/json";
-        }
-        
-        return extension.ToLowerInvariant() switch
-        {
-            ".png" => "image/png",
-            ".jpg" or ".jpeg" => "image/jpeg",
-            ".gif" => "image/gif",
-            ".bmp" => "image/bmp",
-            ".svg" => "image/svg+xml",
-            ".sbit" => "application/octet-stream",
-            ".bit" => "application/octet-stream",
-            ".bin" => "application/octet-stream",
-            ".json" => "application/json",
-            ".zip" => "application/zip",
-            ".md" => "text/markdown",
-            _ => "application/octet-stream"
-        };
-    }
-
-    /// <summary>
-    /// 获取所有实验信息
-    /// </summary>
-    /// <returns>所有实验的数组</returns>
-    public Exam[] GetAllExams()
-    {
-        var exams = this.ExamTable.OrderBy(e => e.ID).ToArray();
-        logger.Debug($"获取所有实验，共 {exams.Length} 个");
-        return exams;
-    }
-
-    /// <summary>
-    /// 根据实验ID获取实验信息
-    /// </summary>
-    /// <param name="examId">实验ID</param>
-    /// <returns>包含实验信息的结果，如果未找到则返回空</returns>
-    public Result<Optional<Exam>> GetExamByID(string examId)
-    {
-        var exams = this.ExamTable.Where(exam => exam.ID == examId).ToArray();
-
-        if (exams.Length > 1)
-        {
-            logger.Error($"数据库中存在多个相同ID的实验: {examId}");
-            return new(new Exception($"数据库中存在多个相同ID的实验: {examId}"));
-        }
-
-        if (exams.Length == 0)
-        {
-            logger.Info($"未找到ID对应的实验: {examId}");
-            return new(Optional<Exam>.None);
-        }
-
-        logger.Debug($"成功获取实验信息: {examId}");
-        return new(exams[0]);
-    }
-
-    /// <summary>
-    /// 根据文件扩展名获取比特流MIME类型
-    /// </summary>
-    /// <param name="extension">文件扩展名</param>
-    /// <returns>MIME类型</returns>
-    private string GetBitstreamMimeType(string extension)
-    {
-        return extension.ToLowerInvariant() switch
-        {
-            ".bit" => "application/octet-stream",
-            ".sbit" => "application/octet-stream",
-            ".bin" => "application/octet-stream",
-            ".mcs" => "application/octet-stream",
-            ".hex" => "text/plain",
-            _ => "application/octet-stream"
-        };
-    }
 }

server/src/Hubs/JtagHub.cs

@@ -1,195 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Cors;
-using System.Security.Claims;
-using Microsoft.AspNetCore.SignalR;
-using DotNext;
-using System.Collections.Concurrent;
-using TypedSignalR.Client;
-using Tapper;
-
-namespace server.Hubs;
-
-[Hub]
-public interface IJtagHub
-{
-    Task<bool> SetBoundaryScanFreq(int freq);
-    Task<bool> StartBoundaryScan(int freq = 100);
-    Task<bool> StopBoundaryScan();
-}
-
-[Receiver]
-public interface IJtagReceiver
-{
-    Task OnReceiveBoundaryScanData(Dictionary<string, bool> msg);
-}
-
-[Authorize]
-[EnableCors("SignalR")]
-public class JtagHub : Hub<IJtagReceiver>, IJtagHub
-{
-    private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-    private static ConcurrentDictionary<string, int> FreqTable = new();
-    private static ConcurrentDictionary<string, CancellationTokenSource> CancellationTokenSourceTable = new();
-
-    private readonly IHubContext<JtagHub, IJtagReceiver> _hubContext;
-
-    public JtagHub(IHubContext<JtagHub, IJtagReceiver> hubContext)
-    {
-        _hubContext = hubContext;
-    }
-
-    private Optional<Peripherals.JtagClient.Jtag> GetJtagClient(string userName)
-    {
-        try
-        {
-            using var db = new Database.AppDataConnection();
-            var board = db.GetBoardByUserName(userName);
-            if (!board.IsSuccessful)
-            {
-                logger.Error($"Find Board {board.Value.Value.ID} failed because {board.Error}");
-                return new(null);
-            }
-            if (!board.Value.HasValue)
-            {
-                logger.Error($"Board {board.Value.Value.ID} not found");
-                return new(null);
-            }
-
-            var jtag = new Peripherals.JtagClient.Jtag(board.Value.Value.IpAddr, board.Value.Value.Port);
-            return new(jtag);
-        }
-        catch (Exception error)
-        {
-            logger.Error(error);
-            return new(null);
-        }
-    }
-
-    public async Task<bool> SetBoundaryScanFreq(int freq)
-    {
-        try
-        {
-            var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
-            if (userName is null)
-            {
-                logger.Error("Can't get user info");
-                return false;
-            }
-
-            FreqTable.AddOrUpdate(userName, freq, (key, value) => freq);
-            return true;
-        }
-        catch (Exception error)
-        {
-            logger.Error(error);
-            return false;
-        }
-    }
-
-    public async Task<bool> StartBoundaryScan(int freq = 100)
-    {
-        try
-        {
-            var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
-            if (userName is null)
-            {
-                logger.Error("No Such User");
-                return false;
-            }
-
-            await SetBoundaryScanFreq(freq);
-            var cts = new CancellationTokenSource();
-            CancellationTokenSourceTable.AddOrUpdate(userName, cts, (key, value) => cts);
-
-            _ = Task.Run(
-                    () => BoundaryScanLogicPorts(Context.ConnectionId, userName, cts.Token),
-                    cts.Token)
-                .ContinueWith((task) =>
-                {
-                    if (task.IsFaulted)
-                    {
-                        // 遍历所有异常
-                        foreach (var ex in task.Exception.InnerExceptions)
-                        {
-                            if (ex is OperationCanceledException)
-                            {
-                                logger.Info($"Boundary scan operation cancelled for user {userName}");
-                            }
-                            else
-                            {
-                                logger.Error($"Boundary scan operation failed for user {userName}: {ex}");
-                            }
-                        }
-                    }
-                    else if (task.IsCanceled)
-                    {
-                        logger.Info($"Boundary scan operation cancelled for user {userName}");
-                    }
-                    else
-                    {
-                        logger.Info($"Boundary scan completed successfully for user {userName}");
-                    }
-                });
-
-            logger.Info($"Boundary scan started for user {userName}");
-            return true;
-        }
-        catch (Exception error)
-        {
-            logger.Error(error);
-            return false;
-        }
-    }
-
-    public async Task<bool> StopBoundaryScan()
-    {
-        var userName = Context.User?.FindFirstValue(ClaimTypes.Name);
-        if (userName is null)
-        {
-            logger.Error("No Such User");
-            return false;
-        }
-
-        if (!CancellationTokenSourceTable.TryGetValue(userName, out var cts))
-        {
-            return false;
-        }
-
-        cts.Cancel();
-        cts.Token.WaitHandle.WaitOne();
-
-        logger.Info($"Boundary scan stopped for user {userName}");
-        return true;
-    }
-
-    private async Task BoundaryScanLogicPorts(string connectionID, string userName, CancellationToken cancellationToken)
-    {
-        var jtagCtrl = GetJtagClient(userName).OrThrow(() => new InvalidOperationException("JTAG client not found"));
-        var cntFail = 0;
-
-        while (true && cntFail < 5)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var ret = await jtagCtrl.BoundaryScanLogicalPorts();
-            if (!ret.IsSuccessful)
-            {
-                logger.Error($"User {userName} boundary scan failed for device {jtagCtrl.address}: {ret.Error}");
-                cntFail++;
-                continue;
-            }
-
-            await _hubContext.Clients.Client(connectionID).OnReceiveBoundaryScanData(ret.Value);
-            // logger.Info($"User {userName} successfully completed boundary scan for device {jtagCtrl.address}");
-
-            await Task.Delay(FreqTable.TryGetValue(userName, out var freq) ? 1000 / freq : 1000 / 100, cancellationToken);
-        }
-
-        if (cntFail >= 5)
-        {
-            logger.Error($"User {userName} boundary scan failed for device {jtagCtrl.address} after 5 attempts");
-            throw new InvalidOperationException("Boundary scan failed");
-        }
-    }
-
-}

server/src/Hubs/ProgressHub.cs

@@ -1,61 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using System.Security.Claims;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.AspNetCore.Cors;
-using TypedSignalR.Client;
-using Tapper;
-using server.Services;
-
-namespace server.Hubs;
-
-[Hub]
-public interface IProgressHub
-{
-    Task<bool> Join(string taskId);
-}
-
-[Receiver]
-public interface IProgressReceiver
-{
-    Task OnReceiveProgress(ProgressInfo message);
-}
-
-[TranspilationSource]
-public enum ProgressStatus
-{
-    Pending,
-    InProgress,
-    Completed,
-    Canceled,
-    Failed
-}
-
-[TranspilationSource]
-public class ProgressInfo
-{
-    public string TaskId { get; }
-    public ProgressStatus Status { get; }
-    public int ProgressPercent { get; }
-    public string ErrorMessage { get; }
-};
-
-[Authorize]
-[EnableCors("SignalR")]
-public class ProgressHub : Hub<IProgressReceiver>, IProgressHub
-{
-    private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-
-    private readonly IHubContext<ProgressHub, IProgressReceiver> _hubContext;
-    private readonly ProgressTrackerService _tracker;
-
-    public ProgressHub(IHubContext<ProgressHub, IProgressReceiver> hubContext, ProgressTrackerService tracker)
-    {
-        _hubContext = hubContext;
-        _tracker = tracker;
-    }
-
-    public async Task<bool> Join(string taskId)
-    {
-        return _tracker.BindTask(taskId, Context.ConnectionId);
-    }
-}

server/src/MsgBus.cs

@@ -23,7 +23,7 @@ public static class MsgBus
     /// <returns>无</returns>
     public async static void Init()
     {
-        if (!ArpClient.IsAdministrator())
+        if (!Arp.IsAdministrator())
         {
             logger.Error($"非管理员运行，ARP无法更新，请用管理员权限运行");
             // throw new Exception($"非管理员运行，ARP无法更新，请用管理员权限运行");

server/src/Peripherals/CameraClient.cs

@@ -1,7 +1,6 @@
 using System.Net;
 using DotNext;
 using Peripherals.PowerClient;
-using WebProtocol;
 
 namespace Peripherals.CameraClient;
 
@@ -20,7 +19,7 @@ class Camera
 {
     private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
 
-    readonly int timeout = 500;
+    readonly int timeout = 2000;
     readonly int taskID;
     readonly int port;
     readonly string address;
@@ -44,7 +43,7 @@ class Camera
     /// <param name="address">摄像头设备IP地址</param>
     /// <param name="port">摄像头设备端口</param>
     /// <param name="timeout">超时时间（毫秒）</param>
-    public Camera(string address, int port, int timeout = 500)
+    public Camera(string address, int port, int timeout = 2000)
     {
         if (timeout < 0)
             throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
@@ -226,7 +225,6 @@ class Camera
             this.taskID, // taskID
             FrameAddr,
             (int)_currentFrameLength, // 使用当前分辨率的动态大小
-            BurstType.ExtendBurst,
             this.timeout);
 
         if (!result.IsSuccessful)
@@ -464,20 +462,6 @@ class Camera
         );
     }
 
-    /// <summary>
-    /// 配置为960x540分辨率
-    /// </summary>
-    /// <returns>配置结果</returns>
-    public async ValueTask<Result<bool>> ConfigureResolution960x540()
-    {
-        return await ConfigureResolution(
-            hStart: 0, vStart: 0,
-            dvpHo: 960, dvpVo: 540,
-            hts: 1700, vts: 1500,
-            hOffset: 16, vOffset: 4
-        );
-    }
-
     /// <summary>
     /// 配置为320x240分辨率
     /// </summary>
@@ -559,9 +543,6 @@ class Camera
                 case "640x480":
                     result = await ConfigureResolution640x480();
                     break;
-                case "960x540":
-                    result = await ConfigureResolution960x540();
-                    break;
                 case "1280x720":
                     result = await ConfigureResolution1280x720();
                     break;

server/src/Peripherals/DebuggerClient.cs

@@ -119,18 +119,12 @@ public class DebuggerClient
     /// <summary>
     /// 设置信号捕获模式
     /// </summary>
-    /// <param name="wireNum">要设置的线</param>
     /// <param name="mode">要设置的捕获模式</param>
     /// <returns>操作结果，成功返回true，失败返回错误信息</returns>
-    public async ValueTask<Result<bool>> SetMode(UInt32 wireNum, CaptureMode mode)
+    public async ValueTask<Result<bool>> SetMode(CaptureMode mode)
     {
-        if (wireNum > 512)
-        {
-            return new(new ArgumentException($"Wire Num can't be over 512, but receive num: {wireNum}"));
-        }
-
         UInt32 data = ((UInt32)mode);
-        var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, DebuggerAddr.Mode + wireNum, data, this.timeout);
+        var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, DebuggerAddr.Mode, data, this.timeout);
         if (!ret.IsSuccessful)
         {
             logger.Error($"Failed to set mode: {ret.Error}");
@@ -181,7 +175,7 @@ public class DebuggerClient
             logger.Error("ReadAddr returned invalid data for flag");
             return new(new Exception("Failed to read flag"));
         }
-        return ret.Value.Options.Data[3];
+        return ret.Value.Options.Data[0];
     }
 
     /// <summary>
@@ -207,26 +201,30 @@ public class DebuggerClient
     /// <summary>
     /// 从指定偏移地址读取捕获的数据
     /// </summary>
-    /// <param name="portNum">Port数量</param>
+    /// <param name="offset">数据读取的偏移地址</param>
-    /// <returns>操作结果，成功返回捕获数据，失败返回错误信息</returns>
+    /// <returns>操作结果，成功返回32KB的捕获数据，失败返回错误信息</returns>
-    public async ValueTask<Result<byte[]>> ReadData(UInt32 portNum)
+    public async ValueTask<Result<byte[]>> ReadData(UInt16 offset)
     {
-        var captureData = new byte[1024 * 4 * portNum];
+        var captureData = new byte[1024 * 32];
         {
-            var ret = await UDPClientPool.ReadAddr4Bytes(this.ep, this.taskID, this.captureDataAddr, captureData.Length / 4, this.timeout);
+            var ret = await UDPClientPool.ReadAddr4BytesAsync(this.ep, this.taskID, this.captureDataAddr + offset, 512, this.timeout);
             if (!ret.IsSuccessful)
             {
                 logger.Error($"Failed to read data: {ret.Error}");
                 return new(ret.Error);
             }
 
-            if (ret.Value.Length != captureData.Length)
+            Buffer.BlockCopy(ret.Value, 0, captureData, 0, 512 * 4);
+        }
         {
-                logger.Error($"Receive capture data length should be {captureData.Length} instead of {ret.Value.Length}");
+            var ret = await UDPClientPool.ReadAddr4BytesAsync(this.ep, this.taskID, this.captureDataAddr + offset + 512, 512, this.timeout);
-                return new(new Exception($"Receive capture data length should be {captureData.Length} instead of {ret.Value.Length}"));
+            if (!ret.IsSuccessful)
+            {
+                logger.Error($"Failed to read data: {ret.Error}");
+                return new(ret.Error);
             }
 
-            Buffer.BlockCopy(ret.Value, 0, captureData, 0, captureData.Length);
+            Buffer.BlockCopy(ret.Value, 0, captureData, 512 * 4, 512 * 4);
         }
 
         return captureData;

server/src/Peripherals/HdmiInClient.cs

@@ -1,120 +0,0 @@
-using System.Net;
-using DotNext;
-using Peripherals.PowerClient;
-using WebProtocol;
-
-namespace Peripherals.HdmiInClient;
-
-static class HdmiInAddr
-{
-    public const UInt32 BASE = 0xA000_0000;
-    public const UInt32 HdmiIn_CTRL = BASE + 0x0; //[0]: rstn, 0 is reset.
-    public const UInt32 HdmiIn_READFIFO = BASE + 0x1;
-}
-
-class HdmiIn
-{
-    private static readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-
-    readonly int timeout = 500;
-    readonly int taskID;
-    readonly int port;
-    readonly string address;
-    private IPEndPoint ep;
-
-    // 动态分辨率参数
-    private UInt16 _currentWidth = 960;
-    private UInt16 _currentHeight = 540;
-    private UInt32 _currentFrameLength = 960 * 540 * 2 / 4; // RGB565格式，2字节/像素，按4字节对齐
-
-    /// <summary>
-    /// 初始化HDMI输入客户端
-    /// </summary>
-    /// <param name="address">HDMI输入设备IP地址</param>
-    /// <param name="port">HDMI输入设备端口</param>
-    /// <param name="taskID">任务ID</param>
-    /// <param name="timeout">超时时间（毫秒）</param>
-    public HdmiIn(string address, int port, int taskID, int timeout = 500)
-    {
-        if (timeout < 0)
-            throw new ArgumentException("Timeout couldn't be negative", nameof(timeout));
-        this.address = address;
-        this.port = port;
-        this.ep = new IPEndPoint(IPAddress.Parse(address), port);
-        this.taskID = taskID;
-        this.timeout = timeout;
-    }
-
-    public async ValueTask<Result<bool>> EnableTrans(bool isEnable)
-    {
-        var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, HdmiInAddr.HdmiIn_CTRL, (isEnable ? 0x00000001u : 0x00000000u));
-        if (!ret.IsSuccessful)
-        {
-            logger.Error($"Failed to write HdmiIn_CTRL to HdmiIn at {this.address}:{this.port}, error: {ret.Error}");
-            return new(ret.Error);
-        }
-        if (!ret.Value)
-        {
-            logger.Error($"HdmiIn_CTRL write returned false for HdmiIn at {this.address}:{this.port}");
-            return false;
-        }
-        return true;
-    }
-
-    /// <summary>
-    /// 读取一帧图像数据
-    /// </summary>
-    /// <returns>包含图像数据的字节数组</returns>
-    public async ValueTask<Result<byte[]>> ReadFrame()
-    {
-        // 只在第一次或出错时清除UDP缓冲区，避免每帧都清除造成延迟
-        // MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
-
-        logger.Trace($"Reading frame from HdmiIn {this.address}");
-
-        // 使用UDPClientPool读取图像帧数据
-        var result = await UDPClientPool.ReadAddr4BytesAsync(
-            this.ep,
-            this.taskID, // taskID
-            HdmiInAddr.HdmiIn_READFIFO,
-            (int)_currentFrameLength, // 使用当前分辨率的动态大小
-            BurstType.FixedBurst,
-            this.timeout);
-
-        if (!result.IsSuccessful)
-        {
-            logger.Error($"Failed to read frame from HdmiIn {this.address}:{this.port}, error: {result.Error}");
-            // 读取失败时清除缓冲区，为下次读取做准备
-            try
-            {
-                MsgBus.UDPServer.ClearUDPData(this.address, this.taskID);
-            }
-            catch (Exception ex)
-            {
-                logger.Warn($"Failed to clear UDP data after read error: {ex.Message}");
-            }
-            return new(result.Error);
-        }
-
-        logger.Trace($"Successfully read frame from HdmiIn {this.address}:{this.port}, data length: {result.Value.Length} bytes");
-        return result.Value;
-    }
-
-    /// <summary>
-    /// 获取当前分辨率
-    /// </summary>
-    /// <returns>当前分辨率(宽度, 高度)</returns>
-    public (int Width, int Height) GetCurrentResolution()
-    {
-        return (_currentWidth, _currentHeight);
-    }
-
-    /// <summary>
-    /// 获取当前帧长度
-    /// </summary>
-    /// <returns>当前帧长度</returns>
-    public UInt32 GetCurrentFrameLength()
-    {
-        return _currentFrameLength;
-    }
-}

server/src/Peripherals/JtagClient.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Net;
 using DotNext;
 using Newtonsoft.Json;
-using server.Services;
+using server;
 using WebProtocol;
 
 namespace Peripherals.JtagClient;
@@ -386,10 +386,7 @@ public class Jtag
     readonly int timeout;
 
     readonly int port;
-    /// <summary>
+    readonly string address;
-    /// Jtag控制器IP地址
-    /// </summary>
-    public readonly string address;
     private IPEndPoint ep;
 
     /// <summary>
@@ -439,15 +436,14 @@ public class Jtag
         if (retPackLen != 4)
             return new(new Exception($"RecvDataPackage BodyData Length not Equal to 4: Total {retPackLen} bytes"));
 
-        return Convert.ToUInt32(Common.Number.BytesToUInt32(retPackOpts.Data).Value);
+        return Convert.ToUInt32(Common.Number.BytesToUInt64(retPackOpts.Data).Value);
     }
 
-    async ValueTask<Result<bool>> WriteFIFO(
+    async ValueTask<Result<bool>> WriteFIFO
-        UInt32 devAddr, UInt32 data, UInt32 result,
+        (UInt32 devAddr, UInt32 data, UInt32 result, UInt32 resultMask = 0xFF_FF_FF_FF, UInt32 delayMilliseconds = 0)
-        UInt32 resultMask = 0xFF_FF_FF_FF, UInt32 delayMilliseconds = 0, ProgressReporter? progress = null)
     {
         {
-            var ret = await UDPClientPool.WriteAddr(this.ep, 0, devAddr, data, this.timeout, progress?.CreateChild(80));
+            var ret = await UDPClientPool.WriteAddr(this.ep, 0, devAddr, data, this.timeout);
             if (!ret.IsSuccessful) return new(ret.Error);
             if (!ret.Value) return new(new Exception("Write FIFO failed"));
         }
@@ -458,17 +454,15 @@ public class Jtag
         {
             var ret = await UDPClientPool.ReadAddrWithWait(this.ep, 0, JtagAddr.STATE, result, resultMask, 0, this.timeout);
             if (!ret.IsSuccessful) return new(ret.Error);
-            progress?.Finish();
             return ret.Value;
         }
     }
 
-    async ValueTask<Result<bool>> WriteFIFO(
+    async ValueTask<Result<bool>> WriteFIFO
-        UInt32 devAddr, byte[] data, UInt32 result,
+        (UInt32 devAddr, byte[] data, UInt32 result, UInt32 resultMask = 0xFF_FF_FF_FF, UInt32 delayMilliseconds = 0)
-        UInt32 resultMask = 0xFF_FF_FF_FF, UInt32 delayMilliseconds = 0, ProgressReporter? progress = null)
     {
         {
-            var ret = await UDPClientPool.WriteAddr(this.ep, 0, devAddr, data, this.timeout, progress?.CreateChild(80));
+            var ret = await UDPClientPool.WriteAddr(this.ep, 0, devAddr, data, this.timeout);
             if (!ret.IsSuccessful) return new(ret.Error);
             if (!ret.Value) return new(new Exception("Write FIFO failed"));
         }
@@ -479,7 +473,6 @@ public class Jtag
         {
             var ret = await UDPClientPool.ReadAddrWithWait(this.ep, 0, JtagAddr.STATE, result, resultMask, 0, this.timeout);
             if (!ret.IsSuccessful) return new(ret.Error);
-            progress?.Finish();
             return ret.Value;
         }
     }
@@ -563,8 +556,7 @@ public class Jtag
         return await ClearWriteDataReg();
     }
 
-    async ValueTask<Result<bool>> LoadDRCareInput(
+    async ValueTask<Result<bool>> LoadDRCareInput(byte[] bytesArray, UInt32 timeout = 10_000, UInt32 cycle = 500)
-        byte[] bytesArray, UInt32 timeout = 10_000, UInt32 cycle = 500, ProgressReporter? progress = null)
     {
         var bytesLen = ((uint)(bytesArray.Length * 8));
         if (bytesLen > Math.Pow(2, 28)) return new(new Exception("Length is over 2^(28 - 3)"));
@@ -579,15 +571,11 @@ public class Jtag
             else if (!ret.Value) return new(new Exception("Write CMD_JTAG_LOAD_DR_CAREI Failed"));
         }
 
-        progress?.Report(10);
-
         {
             var ret = await WriteFIFO(
                 JtagAddr.WRITE_DATA,
                 bytesArray, 0x01_00_00_00,
-                JtagState.CMD_EXEC_FINISH,
+                JtagState.CMD_EXEC_FINISH);
-                progress: progress?.CreateChild(90)
-            );
 
             if (!ret.IsSuccessful) return new(ret.Error);
             return ret.Value;
@@ -621,10 +609,13 @@ public class Jtag
         if (ret.Value)
         {
             var array = new UInt32[UInt32Num];
-            var retData = await UDPClientPool.ReadAddr4Bytes(ep, 0, JtagAddr.READ_DATA, (int)UInt32Num);
+            for (int i = 0; i < UInt32Num; i++)
+            {
+                var retData = await ReadFIFO(JtagAddr.READ_DATA);
                 if (!retData.IsSuccessful)
                     return new(new Exception("Read FIFO failed when Load DR"));
-            Buffer.BlockCopy(retData.Value, 0, array, 0, (int)UInt32Num * 4);
+                array[i] = retData.Value;
+            }
             return array;
         }
         else
@@ -710,55 +701,44 @@ public class Jtag
     /// </summary>
     /// <param name="bitstream">比特流数据</param>
     /// <returns>指示下载是否成功的异步结果</returns>
-    public async ValueTask<Result<bool>> DownloadBitstream(byte[] bitstream, ProgressReporter? progress = null)
+    public async ValueTask<Result<bool>> DownloadBitstream(byte[] bitstream)
     {
         // Clear Data
         MsgBus.UDPServer.ClearUDPData(this.address, 0);
 
         logger.Trace($"Clear up udp server {this.address,0} receive data");
-        if (progress != null)
-        {
-            progress.ExpectedSteps = 25;
-            progress.Increase();
-        }
 
         Result<bool> ret;
 
         ret = await CloseTest();
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Close Test Failed"));
-        progress?.Increase();
 
         ret = await RunTest();
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Run Test Failed"));
-        progress?.Increase();
 
         logger.Trace("Jtag initialize");
 
         ret = await ExecRDCmd(JtagCmd.JTAG_DR_JRST);
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Execute Command JTAG_DR_JRST Failed"));
-        progress?.Increase();
 
         ret = await RunTest();
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Run Test Failed"));
-        progress?.Increase();
 
         ret = await ExecRDCmd(JtagCmd.JTAG_DR_CFGI);
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Execute Command JTAG_DR_CFGI Failed"));
-        progress?.Increase();
 
         logger.Trace("Jtag ready to write bitstream");
 
         ret = await IdleDelay(100000);
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag IDLE Delay Failed"));
-        progress?.Increase();
 
-        ret = await LoadDRCareInput(bitstream, progress: progress?.CreateChild(50));
+        ret = await LoadDRCareInput(bitstream);
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Load Data Failed"));
 
@@ -767,40 +747,32 @@ public class Jtag
         ret = await CloseTest();
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Close Test Failed"));
-        progress?.Increase();
 
         ret = await RunTest();
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Run Test Failed"));
-        progress?.Increase();
 
         ret = await ExecRDCmd(JtagCmd.JTAG_DR_JWAKEUP);
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Execute Command JTAG_DR_JWAKEUP Failed"));
-        progress?.Increase();
 
         logger.Trace("Jtag reset device");
 
         ret = await IdleDelay(10000);
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag IDLE Delay Failed"));
-        progress?.Increase();
 
         var retCode = await ReadStatusReg();
         if (!retCode.IsSuccessful) return new(retCode.Error);
         var jtagStatus = new JtagStatusReg(retCode.Value);
         if (!(jtagStatus.done && jtagStatus.wakeup_over && jtagStatus.init_complete))
             return new(new Exception("Jtag download bitstream failed"));
-        progress?.Increase();
 
         ret = await CloseTest();
         if (!ret.IsSuccessful) return new(ret.Error);
         else if (!ret.Value) return new(new Exception("Jtag Close Test Failed"));
         logger.Trace("Jtag download bitstream successfully");
-        progress?.Increase();
 
-        // Finish
-        progress?.Finish();
         return true;
     }
 
@@ -813,7 +785,7 @@ public class Jtag
     {
         var paser = new BsdlParser.Parser();
         var portNum = paser.GetBoundaryRegsNum().Value;
-        logger.Debug($"Get boundary scan registers number: {portNum}");
+        logger.Debug($"Get boundar scan registers number: {portNum}");
 
         // Clear Data
         MsgBus.UDPServer.ClearUDPData(this.address, 0);

server/src/Peripherals/LogicAnalyzerClient.cs

@@ -2,15 +2,12 @@ using System.Collections;
 using System.Net;
 using Common;
 using DotNext;
-using WebProtocol;
 
 namespace Peripherals.LogicAnalyzerClient;
 
 static class AnalyzerAddr
 {
     const UInt32 BASE = 0x9000_0000;
-    const UInt32 DMA1_BASE = 0x7000_0000;
-    const UInt32 DDR_BASE = 0x0000_0000;
 
     /// <summary> 
     /// 0x0000_0000    R/W [ 0]      capture on:    置1开始等待捕获，0停止捕获。捕获到信号后该位自动清零。  <br/>
@@ -47,38 +44,22 @@ static class AnalyzerAddr
     ///                                                   111 SOME NUMBER <br/>
     /// </summary>
     public static readonly UInt32[] SIGNAL_TRIG_MODE = {
-        BASE + 0x0000_0010, BASE + 0x0000_0011,
+        BASE + 0x0000_0010,
-        BASE + 0x0000_0012, BASE + 0x0000_0013,
+        BASE + 0x0000_0011,
-        BASE + 0x0000_0014, BASE + 0x0000_0015,
+        BASE + 0x0000_0012,
-        BASE + 0x0000_0016, BASE + 0x0000_0017,
+        BASE + 0x0000_0013,
-        BASE + 0x0000_0018, BASE + 0x0000_0019,
+        BASE + 0x0000_0014,
-        BASE + 0x0000_001A, BASE + 0x0000_001B,
+        BASE + 0x0000_0015,
-        BASE + 0x0000_001C, BASE + 0x0000_001D,
+        BASE + 0x0000_0016,
-        BASE + 0x0000_001E, BASE + 0x0000_001F,
+        BASE + 0x0000_0017,
-        BASE + 0x0000_0020, BASE + 0x0000_0021,
-        BASE + 0x0000_0022, BASE + 0x0000_0023,
-        BASE + 0x0000_0024, BASE + 0x0000_0025,
-        BASE + 0x0000_0026, BASE + 0x0000_0027,
-        BASE + 0x0000_0028, BASE + 0x0000_0029,
-        BASE + 0x0000_002A, BASE + 0x0000_002B,
-        BASE + 0x0000_002C, BASE + 0x0000_002D,
-        BASE + 0x0000_002E, BASE + 0x0000_002F
     };
-    public const UInt32 LOAD_NUM_ADDR = BASE + 0x0000_0002;
-    public const UInt32 PRE_LOAD_NUM_ADDR = BASE + 0x0000_0003;
-    public const UInt32 CAHNNEL_DIV_ADDR = BASE + 0x0000_0004;
-    public const UInt32 CLOCK_DIV_ADDR = BASE + 0x0000_0005;
-    public const UInt32 DMA1_START_WRITE_ADDR = DMA1_BASE + 0x0000_0012;
-    public const UInt32 DMA1_END_WRITE_ADDR = DMA1_BASE + 0x0000_0013;
-    public const UInt32 DMA1_CAPTURE_CTRL_ADDR = DMA1_BASE + 0x0000_0014;
-    public const UInt32 STORE_OFFSET_ADDR = DDR_BASE + 0x0100_0000;
 
     /// <summary> 
     /// 0x0100_0000 - 0x0100_03FF 只读 32位波形存储，得到的32位数据中低八位最先捕获，高八位最后捕获。<br/>
     ///                                共1024个地址，每个地址存储4组，深度为4096。<br/>
     /// </summary>
+    public const UInt32 CAPTURE_DATA_ADDR = BASE + 0x0100_0000;
     public const Int32 CAPTURE_DATA_LENGTH = 1024;
-    public const Int32 CAPTURE_DATA_PRELOAD = 512;
 }
 
 /// <summary>
@@ -139,52 +120,6 @@ public enum GlobalCaptureMode
     NOR = 0b11
 }
 
-/// <summary>
-/// 逻辑分析仪采样时钟分频系数
-/// </summary>
-public enum AnalyzerClockDiv
-{
-    /// <summary> 
-    /// 1分频
-    /// </summary>
-    DIV1 = 0x0000_0000,
-
-    /// <summary> 
-    /// 2分频
-    /// </summary>
-    DIV2 = 0x0000_0001,
-
-    /// <summary> 
-    /// 4分频
-    /// </summary>
-    DIV4 = 0x0000_0002,
-
-    /// <summary> 
-    /// 8分频
-    /// </summary>
-    DIV8 = 0x0000_0003,
-
-    /// <summary> 
-    /// 16分频
-    /// </summary>
-    DIV16 = 0x0000_0004,
-
-    /// <summary> 
-    /// 32分频
-    /// </summary>
-    DIV32 = 0x0000_0005,
-
-    /// <summary>
-    /// 64分频
-    /// </summary>
-    DIV64 = 0x0000_0006,
-
-    /// <summary>
-    /// 128分频
-    /// </summary>
-    DIV128 = 0x0000_0007
-}
-
 /// <summary>
 /// 信号M的操作符枚举
 /// </summary>
@@ -255,37 +190,6 @@ public enum SignalValue : byte
     SomeNumber = 0b111     // SOME NUMBER
 }
 
-/// <summary>
-/// 逻辑分析仪有效通道数
-/// </summary>
-public enum AnalyzerChannelDiv
-{
-    /// <summary> 
-    /// 1路
-    /// </summary>
-    ONE = 0x0000_0000,
-    /// <summary> 
-    /// 2路
-    /// </summary>
-    TWO = 0x0000_0001,
-    /// <summary>
-    /// 4路
-    /// </summary>
-    FOUR = 0x0000_0002,
-    /// <summary>
-    /// 8路
-    /// </summary>
-    EIGHT = 0x0000_0003,
-    /// <summary>
-    /// 16路
-    /// </summary>
-    XVI = 0x0000_0004,
-    /// <summary>
-    /// 32路
-    /// </summary>
-    XXXII = 0x0000_0005
-}
-
 /// <summary>
 /// FPGA逻辑分析仪客户端，用于控制FPGA上的逻辑分析仪模块进行信号捕获和分析
 /// </summary>
@@ -330,21 +234,8 @@ public class Analyzer
         // 构造寄存器值
         UInt32 value = 0;
         if (captureOn) value |= 1 << 0;
-        {
-            var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.DMA1_CAPTURE_CTRL_ADDR, value, this.timeout);
-            if (!ret.IsSuccessful)
-            {
-                logger.Error($"Failed to set DMA1_CAPTURE_CTRL_ADDR: {ret.Error}");
-                return new(ret.Error);
-            }
-            if (!ret.Value)
-            {
-                logger.Error("WriteAddr to DMA1_CAPTURE_CTRL_ADDR returned false");
-                return new(new Exception("Failed to set DMA1_CAPTURE_CTRL_ADDR"));
-            }
-        }
         if (force) value |= 1 << 8;
-        {
+
         var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.CAPTURE_MODE, value, this.timeout);
         if (!ret.IsSuccessful)
         {
@@ -356,7 +247,6 @@ public class Analyzer
             logger.Error("WriteAddr to CAPTURE_MODE returned false");
             return new(new Exception("Failed to set capture mode"));
         }
-        }
         return true;
     }
 
@@ -433,111 +323,17 @@ public class Analyzer
         return true;
     }
 
-    /// <summary>
-    /// 设置逻辑分析仪的深度、预采样深度、有效通道、分频系数
-    /// </summary>
-    /// <param name="capture_length">深度</param>
-    /// <param name="pre_capture_length">预采样深度</param>
-    /// <param name="channel_div">有效通道(0-[1],1-[2],2-[4],3-[8],4-[16],5-[32])</param>
-    /// <param name="clock_div">采样时钟分频系数</param>
-    /// <returns>操作结果，成功返回true，否则返回异常信息</returns>
-    public async ValueTask<Result<bool>> SetCaptureParams(int capture_length, int pre_capture_length, AnalyzerChannelDiv channel_div, AnalyzerClockDiv clock_div)
-    {
-        if (capture_length == 0) capture_length = 1;
-        if (pre_capture_length == 0) pre_capture_length = 1;
-        {
-            var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.LOAD_NUM_ADDR, (UInt32)(capture_length - 1), this.timeout);
-            if (!ret.IsSuccessful)
-            {
-                logger.Error($"Failed to set LOAD_NUM_ADDR: {ret.Error}");
-                return new(ret.Error);
-            }
-            if (!ret.Value)
-            {
-                logger.Error("WriteAddr to LOAD_NUM_ADDR returned false");
-                return new(new Exception("Failed to set LOAD_NUM_ADDR"));
-            }
-        }
-        {
-            var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.PRE_LOAD_NUM_ADDR, (UInt32)(pre_capture_length - 1), this.timeout);
-            if (!ret.IsSuccessful)
-            {
-                logger.Error($"Failed to set PRE_LOAD_NUM_ADDR: {ret.Error}");
-                return new(ret.Error);
-            }
-            if (!ret.Value)
-            {
-                logger.Error("WriteAddr to PRE_LOAD_NUM_ADDR returned false");
-                return new(new Exception("Failed to set PRE_LOAD_NUM_ADDR"));
-            }
-        }
-        {
-            var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.DMA1_START_WRITE_ADDR, AnalyzerAddr.STORE_OFFSET_ADDR, this.timeout);
-            if (!ret.IsSuccessful)
-            {
-                logger.Error($"Failed to set DMA1_START_WRITE_ADDR: {ret.Error}");
-                return new(ret.Error);
-            }
-            if (!ret.Value)
-            {
-                logger.Error("WriteAddr to DMA1_START_WRITE_ADDR returned false");
-                return new(new Exception("Failed to set DMA1_START_WRITE_ADDR"));
-            }
-        }
-        {
-            var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.DMA1_END_WRITE_ADDR, AnalyzerAddr.STORE_OFFSET_ADDR + (UInt32)(capture_length - 1), this.timeout);
-            if (!ret.IsSuccessful)
-            {
-                logger.Error($"Failed to set DMA1_END_WRITE_ADDR: {ret.Error}");
-                return new(ret.Error);
-            }
-            if (!ret.Value)
-            {
-                logger.Error("WriteAddr to DMA1_END_WRITE_ADDR returned false");
-                return new(new Exception("Failed to set DMA1_END_WRITE_ADDR"));
-            }
-        }
-        {
-            var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.CAHNNEL_DIV_ADDR, (UInt32)channel_div, this.timeout);
-            if (!ret.IsSuccessful)
-            {
-                logger.Error($"Failed to set CAHNNEL_DIV_ADDR: {ret.Error}");
-                return new(ret.Error);
-            }
-            if (!ret.Value)
-            {
-                logger.Error("WriteAddr to CAHNNEL_DIV_ADDR returned false");
-                return new(new Exception("Failed to set CAHNNEL_DIV_ADDR"));
-            }
-        }
-        {
-            var ret = await UDPClientPool.WriteAddr(this.ep, this.taskID, AnalyzerAddr.CLOCK_DIV_ADDR, (UInt32)clock_div, this.timeout);
-            if (!ret.IsSuccessful)
-            {
-                logger.Error($"Failed to set CLOCK_DIV_ADDR: {ret.Error}");
-                return new(ret.Error);
-            }
-            if (!ret.Value)
-            {
-                logger.Error("WriteAddr to CLOCK_DIV_ADDR returned false");
-                return new(new Exception("Failed to set CLOCK_DIV_ADDR"));
-            }
-        }
-        return true;
-    }
-
     /// <summary>
     /// 读取捕获的波形数据
     /// </summary>
     /// <returns>操作结果，成功返回byte[]，否则返回异常信息</returns>
-    public async ValueTask<Result<byte[]>> ReadCaptureData(int capture_length = 2048 * 32)
+    public async ValueTask<Result<byte[]>> ReadCaptureData()
     {
         var ret = await UDPClientPool.ReadAddr4BytesAsync(
             this.ep,
             this.taskID,
-            AnalyzerAddr.STORE_OFFSET_ADDR,
+            AnalyzerAddr.CAPTURE_DATA_ADDR,
-            capture_length,
+            AnalyzerAddr.CAPTURE_DATA_LENGTH,
-            BurstType.ExtendBurst, // 使用扩展突发读取
             this.timeout
         );
         if (!ret.IsSuccessful)
@@ -546,7 +342,7 @@ public class Analyzer
             return new(ret.Error);
         }
         var data = ret.Value;
-        if (data == null || data.Length != capture_length * 4)
+        if (data == null || data.Length != AnalyzerAddr.CAPTURE_DATA_LENGTH * 4)
         {
             logger.Error($"Capture data length mismatch: {data?.Length}");
             return new(new Exception("Capture data length mismatch"));

server/src/Peripherals/OscilloscopeClient.cs

@@ -1,7 +1,6 @@
 using System.Net;
 using Common;
 using DotNext;
-using WebProtocol;
 
 namespace Peripherals.OscilloscopeClient;
 
@@ -320,7 +319,6 @@ class Oscilloscope
             this.taskID,
             OscilloscopeAddr.RD_DATA_ADDR,
             (int)OscilloscopeAddr.RD_DATA_LENGTH / 32,
-            BurstType.ExtendBurst, // 使用扩展突发读取
             this.timeout
         );
         if (!ret.IsSuccessful)

server/src/Services/HttpHdmiVideoStreamService.cs

@@ -1,498 +0,0 @@
-using System.Net;
-using System.Collections.Concurrent;
-using Peripherals.HdmiInClient;
-
-namespace server.Services;
-
-public class HdmiVideoStreamEndpoint
-{
-    public string BoardId { get; set; } = "";
-    public string MjpegUrl { get; set; } = "";
-    public string VideoUrl { get; set; } = "";
-    public string SnapshotUrl { get; set; } = "";
-}
-
-public class HttpHdmiVideoStreamService : BackgroundService
-{
-    private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-    private HttpListener? _httpListener;
-    private readonly int _serverPort = 4322;
-    private readonly ConcurrentDictionary<string, HdmiIn> _hdmiInDict = new();
-    private readonly ConcurrentDictionary<string, CancellationTokenSource> _hdmiInCtsDict = new();
-
-    public override async Task StartAsync(CancellationToken cancellationToken)
-    {
-        _httpListener = new HttpListener();
-        _httpListener.Prefixes.Add($"http://*:{_serverPort}/");
-        _httpListener.Start();
-        logger.Info($"HDMI Video Stream Service started on port {_serverPort}");
-
-        await base.StartAsync(cancellationToken);
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        try
-        {
-            while (!stoppingToken.IsCancellationRequested)
-            {
-                HttpListenerContext? context = null;
-                try
-                {
-                    logger.Debug("Waiting for HTTP request...");
-                    context = await _httpListener.GetContextAsync();
-                    logger.Debug($"Received request: {context.Request.Url?.AbsolutePath}");
-                }
-                catch (ObjectDisposedException)
-                {
-                    // Listener closed, exit loop
-                    break;
-                }
-                catch (HttpListenerException)
-                {
-                    // Listener closed, exit loop
-                    break;
-                }
-                catch (Exception ex)
-                {
-                    logger.Error(ex, "Error in GetContextAsync");
-                    break;
-                }
-                if (context != null)
-                    _ = HandleRequestAsync(context, stoppingToken);
-            }
-        }
-        finally
-        {
-            _httpListener?.Close();
-            logger.Info("HDMI Video Stream Service stopped.");
-        }
-    }
-
-    public override async Task StopAsync(CancellationToken cancellationToken)
-    {
-        logger.Info("Stopping HDMI Video Stream Service...");
-
-        // 禁用所有活跃的HDMI传输
-        var disableTasks = new List<Task>();
-        foreach (var hdmiKey in _hdmiInDict.Keys)
-        {
-            disableTasks.Add(DisableHdmiTransmissionAsync(hdmiKey));
-        }
-
-        // 等待所有禁用操作完成
-        await Task.WhenAll(disableTasks);
-
-        // 清空字典
-        _hdmiInDict.Clear();
-        _hdmiInCtsDict.Clear();
-
-        _httpListener?.Close(); // 立即关闭监听器，唤醒阻塞
-        await base.StopAsync(cancellationToken);
-    }
-
-    public async Task DisableHdmiTransmissionAsync(string key)
-    {
-        try
-        {
-            var cts = _hdmiInCtsDict[key];
-            cts.Cancel();
-
-            var hdmiIn = _hdmiInDict[key];
-            var disableResult = await hdmiIn.EnableTrans(false);
-            if (disableResult.IsSuccessful)
-            {
-                logger.Info("Successfully disabled HDMI transmission");
-            }
-            else
-            {
-                logger.Error($"Failed to disable HDMI transmission: {disableResult.Error}");
-            }
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "Exception occurred while disabling HDMI transmission");
-        }
-    }
-
-    // 获取/创建 HdmiIn 实例
-    private async Task<HdmiIn?> GetOrCreateHdmiInAsync(string boardId)
-    {
-        if (_hdmiInDict.TryGetValue(boardId, out var hdmiIn))
-        {
-            try
-            {
-                var enableResult = await hdmiIn.EnableTrans(true);
-                if (!enableResult.IsSuccessful)
-                {
-                    logger.Error($"Failed to enable HDMI transmission for board {boardId}: {enableResult.Error}");
-                    return null;
-                }
-                logger.Info($"Successfully enabled HDMI transmission for board {boardId}");
-            }
-            catch (Exception ex)
-            {
-                logger.Error(ex, $"Exception occurred while enabling HDMI transmission for board {boardId}");
-                return null;
-            }
-
-            _hdmiInDict[boardId] = hdmiIn;
-            _hdmiInCtsDict[boardId] = new CancellationTokenSource();
-            return hdmiIn;
-        }
-
-        var db = new Database.AppDataConnection();
-        if (db == null)
-        {
-            logger.Error("Failed to create HdmiIn instance");
-            return null;
-        }
-
-        var boardRet = db.GetBoardByID(Guid.Parse(boardId));
-        if (!boardRet.IsSuccessful || !boardRet.Value.HasValue)
-        {
-            logger.Error($"Failed to get board with ID {boardId}");
-            return null;
-        }
-
-        var board = boardRet.Value.Value;
-
-        hdmiIn = new HdmiIn(board.IpAddr, board.Port, 0); // taskID 可根据实际需求调整
-
-        // 启用HDMI传输
-        try
-        {
-            var enableResult = await hdmiIn.EnableTrans(true);
-            if (!enableResult.IsSuccessful)
-            {
-                logger.Error($"Failed to enable HDMI transmission for board {boardId}: {enableResult.Error}");
-                return null;
-            }
-            logger.Info($"Successfully enabled HDMI transmission for board {boardId}");
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, $"Exception occurred while enabling HDMI transmission for board {boardId}");
-            return null;
-        }
-
-        _hdmiInDict[boardId] = hdmiIn;
-        _hdmiInCtsDict[boardId] = new CancellationTokenSource();
-        return hdmiIn;
-    }
-
-    private async Task HandleRequestAsync(HttpListenerContext context, CancellationToken cancellationToken)
-    {
-        var path = context.Request.Url?.AbsolutePath ?? "/";
-        var boardId = context.Request.QueryString["boardId"];
-        if (string.IsNullOrEmpty(boardId))
-        {
-            await SendErrorAsync(context.Response, "Missing boardId");
-            return;
-        }
-
-        var hdmiIn = await GetOrCreateHdmiInAsync(boardId);
-        if (hdmiIn == null)
-        {
-            await SendErrorAsync(context.Response, "Invalid boardId or board not available");
-            return;
-        }
-
-        var hdmiInToken = _hdmiInCtsDict[boardId].Token;
-        if (hdmiInToken == null)
-        {
-            await SendErrorAsync(context.Response, "HDMI input is not available");
-            return;
-        }
-
-        if (path == "/snapshot")
-        {
-            await HandleSnapshotRequestAsync(context.Response, hdmiIn, hdmiInToken);
-        }
-        else if (path == "/mjpeg")
-        {
-            await HandleMjpegStreamAsync(context.Response, hdmiIn, hdmiInToken);
-        }
-        else if (path == "/video")
-        {
-            await SendVideoHtmlPageAsync(context.Response, boardId);
-        }
-        else
-        {
-            await SendIndexHtmlPageAsync(context.Response, boardId);
-        }
-    }
-
-    private async Task HandleSnapshotRequestAsync(HttpListenerResponse response, HdmiIn hdmiIn, CancellationToken cancellationToken)
-    {
-        try
-        {
-            logger.Debug("处理HDMI快照请求");
-
-            const int frameWidth = 960;  // HDMI输入分辨率
-            const int frameHeight = 540;
-
-            // 从HDMI读取RGB565数据
-            var frameResult = await hdmiIn.ReadFrame();
-            if (!frameResult.IsSuccessful || frameResult.Value == null)
-            {
-                logger.Error("HDMI快照获取失败");
-                response.StatusCode = 500;
-                var errorBytes = System.Text.Encoding.UTF8.GetBytes("Failed to get HDMI snapshot");
-                await response.OutputStream.WriteAsync(errorBytes, 0, errorBytes.Length, cancellationToken);
-                response.Close();
-                return;
-            }
-
-            var rgb565Data = frameResult.Value;
-
-            // 验证数据长度
-            var expectedLength = frameWidth * frameHeight * 2;
-            if (rgb565Data.Length != expectedLength)
-            {
-                logger.Warn("HDMI快照数据长度不匹配，期望: {Expected}, 实际: {Actual}",
-                    expectedLength, rgb565Data.Length);
-            }
-
-            // 将RGB565转换为RGB24
-            var rgb24Result = Common.Image.ConvertRGB565ToRGB24(rgb565Data, frameWidth, frameHeight, isLittleEndian: false);
-            if (!rgb24Result.IsSuccessful)
-            {
-                logger.Error("HDMI快照RGB565转RGB24失败: {Error}", rgb24Result.Error);
-                response.StatusCode = 500;
-                var errorBytes = System.Text.Encoding.UTF8.GetBytes("Failed to process HDMI snapshot");
-                await response.OutputStream.WriteAsync(errorBytes, 0, errorBytes.Length, cancellationToken);
-                response.Close();
-                return;
-            }
-
-            // 将RGB24转换为JPEG
-            var jpegResult = Common.Image.ConvertRGB24ToJpeg(rgb24Result.Value, frameWidth, frameHeight, 80);
-            if (!jpegResult.IsSuccessful)
-            {
-                logger.Error("HDMI快照RGB24转JPEG失败: {Error}", jpegResult.Error);
-                response.StatusCode = 500;
-                var errorBytes = System.Text.Encoding.UTF8.GetBytes("Failed to encode HDMI snapshot");
-                await response.OutputStream.WriteAsync(errorBytes, 0, errorBytes.Length, cancellationToken);
-                response.Close();
-                return;
-            }
-
-            var jpegData = jpegResult.Value;
-
-            // 设置响应头（参考Camera版本）
-            response.ContentType = "image/jpeg";
-            response.ContentLength64 = jpegData.Length;
-            response.Headers.Add("Cache-Control", "no-cache, no-store, must-revalidate");
-
-            await response.OutputStream.WriteAsync(jpegData, 0, jpegData.Length, cancellationToken);
-            await response.OutputStream.FlushAsync(cancellationToken);
-
-            logger.Debug("已发送HDMI快照图像，大小：{Size} 字节", jpegData.Length);
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "处理HDMI快照请求时出错");
-            response.StatusCode = 500;
-        }
-        finally
-        {
-            response.Close();
-        }
-    }
-
-    private async Task HandleMjpegStreamAsync(HttpListenerResponse response, HdmiIn hdmiIn, CancellationToken cancellationToken)
-    {
-        try
-        {
-            // 设置MJPEG流的响应头（参考Camera版本）
-            response.ContentType = "multipart/x-mixed-replace; boundary=--boundary";
-            response.Headers.Add("Cache-Control", "no-cache, no-store, must-revalidate");
-            response.Headers.Add("Pragma", "no-cache");
-            response.Headers.Add("Expires", "0");
-
-            logger.Debug("开始HDMI MJPEG流传输");
-
-            int frameCounter = 0;
-            const int frameWidth = 960;  // HDMI输入分辨率
-            const int frameHeight = 540;
-
-            while (!cancellationToken.IsCancellationRequested)
-            {
-                try
-                {
-                    var frameStartTime = DateTime.UtcNow;
-
-                    // 从HDMI读取RGB565数据
-                    var readStartTime = DateTime.UtcNow;
-                    var frameResult = await hdmiIn.ReadFrame();
-                    var readEndTime = DateTime.UtcNow;
-                    var readTime = (readEndTime - readStartTime).TotalMilliseconds;
-
-                    if (!frameResult.IsSuccessful || frameResult.Value == null)
-                    {
-                        logger.Warn("HDMI帧读取失败或为空");
-                        continue;
-                    }
-
-                    var rgb565Data = frameResult.Value;
-
-                    // 验证数据长度是否正确 (RGB565为每像素2字节)
-                    var expectedLength = frameWidth * frameHeight * 2;
-                    if (rgb565Data.Length != expectedLength)
-                    {
-                        logger.Warn("HDMI数据长度不匹配，期望: {Expected}, 实际: {Actual}",
-                            expectedLength, rgb565Data.Length);
-                    }
-
-                    // 将RGB565转换为RGB24（参考Camera版本的处理）
-                    var convertStartTime = DateTime.UtcNow;
-                    var rgb24Result = Common.Image.ConvertRGB565ToRGB24(rgb565Data, frameWidth, frameHeight, isLittleEndian: false);
-                    var convertEndTime = DateTime.UtcNow;
-                    var convertTime = (convertEndTime - convertStartTime).TotalMilliseconds;
-
-                    if (!rgb24Result.IsSuccessful)
-                    {
-                        logger.Error("HDMI RGB565转RGB24失败: {Error}", rgb24Result.Error);
-                        continue;
-                    }
-
-                    // 将RGB24转换为JPEG（参考Camera版本的处理）
-                    var jpegStartTime = DateTime.UtcNow;
-                    var jpegResult = Common.Image.ConvertRGB24ToJpeg(rgb24Result.Value, frameWidth, frameHeight, 80);
-                    var jpegEndTime = DateTime.UtcNow;
-                    var jpegTime = (jpegEndTime - jpegStartTime).TotalMilliseconds;
-
-                    if (!jpegResult.IsSuccessful)
-                    {
-                        logger.Error("HDMI RGB24转JPEG失败: {Error}", jpegResult.Error);
-                        continue;
-                    }
-
-                    var jpegData = jpegResult.Value;
-
-                    // 发送MJPEG帧（使用Camera版本的格式）
-                    var mjpegFrameHeader = Common.Image.CreateMjpegFrameHeader(jpegData.Length);
-                    var mjpegFrameFooter = Common.Image.CreateMjpegFrameFooter();
-
-                    await response.OutputStream.WriteAsync(mjpegFrameHeader, 0, mjpegFrameHeader.Length, cancellationToken);
-                    await response.OutputStream.WriteAsync(jpegData, 0, jpegData.Length, cancellationToken);
-                    await response.OutputStream.WriteAsync(mjpegFrameFooter, 0, mjpegFrameFooter.Length, cancellationToken);
-                    await response.OutputStream.FlushAsync(cancellationToken);
-
-                    frameCounter++;
-
-                    var totalTime = (DateTime.UtcNow - frameStartTime).TotalMilliseconds;
-
-                    // 性能统计日志（每30帧记录一次）
-                    if (frameCounter % 30 == 0)
-                    {
-                        logger.Debug("HDMI帧 {FrameNumber} 性能统计 - 读取: {ReadTime:F1}ms, RGB转换: {ConvertTime:F1}ms, JPEG转换: {JpegTime:F1}ms, 总计: {TotalTime:F1}ms, JPEG大小: {JpegSize} 字节",
-                            frameCounter, readTime, convertTime, jpegTime, totalTime, jpegData.Length);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    logger.Error(ex, "处理HDMI帧时发生错误");
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, "HDMI MJPEG流处理异常");
-        }
-        finally
-        {
-            try
-            {
-                // 停止传输时禁用HDMI传输
-                await hdmiIn.EnableTrans(false);
-                logger.Info("已禁用HDMI传输");
-            }
-            catch (Exception ex)
-            {
-                logger.Error(ex, "禁用HDMI传输时出错");
-            }
-
-            try
-            {
-                response.Close();
-            }
-            catch
-            {
-                // 忽略关闭时的错误
-            }
-            logger.Debug("HDMI MJPEG流连接已关闭");
-        }
-    }
-
-    private async Task SendVideoHtmlPageAsync(HttpListenerResponse response, string boardId)
-    {
-        string html = $@"<html><body>
-                <h1>HDMI Video Stream for Board {boardId}</h1>
-                <img src='/mjpeg?boardId={boardId}' />
-                </body></html>";
-        response.ContentType = "text/html";
-        await response.OutputStream.WriteAsync(System.Text.Encoding.UTF8.GetBytes(html));
-        response.Close();
-    }
-
-    private async Task SendIndexHtmlPageAsync(HttpListenerResponse response, string boardId)
-    {
-        string html = $@"<html><body>
-                <h1>Welcome to HDMI Video Stream Service</h1>
-                <a href='/video?boardId={boardId}'>View Video Stream for Board {boardId}</a>
-                </body></html>";
-        response.ContentType = "text/html";
-        await response.OutputStream.WriteAsync(System.Text.Encoding.UTF8.GetBytes(html));
-        response.Close();
-    }
-
-    private async Task SendErrorAsync(HttpListenerResponse response, string message)
-    {
-        response.StatusCode = 400;
-        await response.OutputStream.WriteAsync(System.Text.Encoding.UTF8.GetBytes(message));
-        response.Close();
-    }
-
-    /// <summary>
-    /// 获取所有可用的HDMI视频流终端点
-    /// </summary>
-    /// <returns>返回所有可用的HDMI视频流终端点列表</returns>
-    public List<HdmiVideoStreamEndpoint>? GetAllVideoEndpoints()
-    {
-        var db = new Database.AppDataConnection();
-        var boards = db?.GetAllBoard();
-        if (boards == null)
-            return null;
-
-        var endpoints = new List<HdmiVideoStreamEndpoint>();
-        foreach (var board in boards)
-        {
-            endpoints.Add(new HdmiVideoStreamEndpoint
-            {
-                BoardId = board.ID.ToString(),
-                MjpegUrl = $"http://{Global.localhost}:{_serverPort}/mjpeg?boardId={board.ID}",
-                VideoUrl = $"http://{Global.localhost}:{_serverPort}/video?boardId={board.ID}",
-                SnapshotUrl = $"http://{Global.localhost}:{_serverPort}/snapshot?boardId={board.ID}"
-            });
-        }
-        return endpoints;
-    }
-
-    /// <summary>
-    /// 获取指定板卡ID的HDMI视频流终端点
-    /// </summary>
-    /// <param name="boardId">板卡ID</param>
-    /// <returns>返回指定板卡的HDMI视频流终端点</returns>
-    public HdmiVideoStreamEndpoint GetVideoEndpoint(string boardId)
-    {
-        return new HdmiVideoStreamEndpoint
-        {
-            BoardId = boardId,
-            MjpegUrl = $"http://{Global.localhost}:{_serverPort}/mjpeg?boardId={boardId}",
-            VideoUrl = $"http://{Global.localhost}:{_serverPort}/video?boardId={boardId}",
-            SnapshotUrl = $"http://{Global.localhost}:{_serverPort}/snapshot?boardId={boardId}"
-        };
-    }
-}

server/src/Services/HttpVideoStreamService.cs

@@ -311,7 +311,7 @@ public class HttpVideoStreamService : BackgroundService
 
             // 创建 HTTP 监听器
             _httpListener = new HttpListener();
-            _httpListener.Prefixes.Add($"http://{Global.localhost}:{_serverPort}/");
+            _httpListener.Prefixes.Add($"http://localhost:{_serverPort}/");
             _httpListener.Start();
 
             logger.Info("HTTP 视频流服务已启动，监听端口: {Port}", _serverPort);
@@ -1109,7 +1109,6 @@ public class HttpVideoStreamService : BackgroundService
         return new List<(int, int, string)>
         {
             (640, 480, "640x480 (VGA)"),
-            (960, 540, "960x540 (qHD)"),
             (1280, 720, "1280x720 (HD)"),
             (1280, 960, "1280x960 (SXGA)"),
             (1920, 1080, "1920x1080 (Full HD)")

server/src/Services/ProgressTrackerService.cs

@@ -1,288 +0,0 @@
-using Microsoft.AspNetCore.SignalR;
-using System.Collections.Concurrent;
-using DotNext;
-using Common;
-using server.Hubs;
-
-namespace server.Services;
-
-public class ProgressReporter : ProgressInfo, IProgress<int>
-{
-    private int _progress = 0;
-    private int _stepProgress = 1;
-    private int _expectedSteps = 100;
-    private int _parentProportion = 100;
-
-    public int Progress => _progress;
-    public int MaxProgress { get; set; } = 100;
-    public int StepProgress
-    {
-        get => _stepProgress;
-        set
-        {
-            _stepProgress = value;
-            ExpectedSteps = MaxProgress / value;
-        }
-    }
-    public int ExpectedSteps
-    {
-        get => _expectedSteps;
-        set
-        {
-            _expectedSteps = value;
-            MaxProgress = Number.IntPow(10, Number.GetLength(value));
-            StepProgress = MaxProgress / value;
-        }
-    }
-    public Func<int, Task>? ReporterFunc { get; set; } = null;
-    public ProgressReporter? Parent { get; set; }
-    public ProgressReporter? Child { get; set; }
-
-    private ProgressStatus _status = ProgressStatus.Pending;
-    private string _errorMessage;
-
-    public string TaskId { get; set; } = new Guid().ToString();
-    public int ProgressPercent => _progress * 100 / MaxProgress;
-    public ProgressStatus Status => _status;
-    public string ErrorMessage => _errorMessage;
-
-    public ProgressReporter(Func<int, Task>? reporter = null, int initProgress = 0, int maxProgress = 100, int step = 1)
-    {
-        _progress = initProgress;
-        MaxProgress = maxProgress;
-        StepProgress = step;
-        ReporterFunc = reporter;
-    }
-
-    public ProgressReporter(int parentProportion, int expectedSteps = 100, Func<int, Task>? reporter = null)
-    {
-        this._parentProportion = parentProportion;
-        MaxProgress = Number.IntPow(10, Number.GetLength(expectedSteps));
-        StepProgress = MaxProgress / expectedSteps;
-        ReporterFunc = reporter;
-    }
-
-    private async void ForceReport(int value)
-    {
-        try
-        {
-            if (ReporterFunc != null)
-                await ReporterFunc(value);
-
-            if (Parent != null)
-                Parent.Increase((value - _progress) / StepProgress * _parentProportion / (MaxProgress / StepProgress));
-
-            _progress = value;
-        }
-        catch (OperationCanceledException ex)
-        {
-            _errorMessage = ex.Message;
-            this._status = ProgressStatus.Canceled;
-        }
-        catch (Exception ex)
-        {
-            _errorMessage = ex.Message;
-            this._status = ProgressStatus.Failed;
-        }
-    }
-
-    public async void Report(int value)
-    {
-        if (this._status == ProgressStatus.Pending)
-            this._status = ProgressStatus.InProgress;
-        else if (this.Status != ProgressStatus.InProgress)
-            return;
-
-        if (value > MaxProgress) return;
-        ForceReport(value);
-    }
-
-    public void Increase(int? value = null)
-    {
-        if (this._status == ProgressStatus.Pending)
-            this._status = ProgressStatus.InProgress;
-        else if (this.Status != ProgressStatus.InProgress)
-            return;
-
-        if (value.HasValue)
-        {
-            if (_progress + value.Value >= MaxProgress) return;
-            this.Report(_progress + value.Value);
-        }
-        else
-        {
-            if (_progress + StepProgress >= MaxProgress) return;
-            this.Report(_progress + StepProgress);
-        }
-    }
-
-    public void Finish()
-    {
-        this._status = ProgressStatus.Completed;
-        this.ForceReport(MaxProgress);
-    }
-
-    public void Cancel()
-    {
-        this._status = ProgressStatus.Canceled;
-        this._errorMessage = "User Cancelled";
-        this.ForceReport(_progress);
-    }
-
-    public void Error(string message)
-    {
-        this._status = ProgressStatus.Failed;
-        this._errorMessage = message;
-        this.ForceReport(_progress);
-    }
-
-    public ProgressReporter CreateChild(int proportion, int expectedSteps = 100)
-    {
-        var child = new ProgressReporter(proportion, expectedSteps);
-        child.Parent = this;
-        this.Child = child;
-        return child;
-    }
-}
-
-public class ProgressTrackerService : BackgroundService
-{
-    private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
-    private readonly ConcurrentDictionary<string, TaskProgressInfo> _taskMap = new();
-    private readonly IHubContext<ProgressHub, IProgressReceiver> _hubContext;
-
-    private class TaskProgressInfo
-    {
-        public ProgressReporter Reporter { get; set; }
-        public string? ConnectionId { get; set; }
-        public required CancellationToken CancellationToken { get; set; }
-        public required CancellationTokenSource CancellationTokenSource { get; set; }
-        public required DateTime UpdatedAt { get; set; }
-    }
-
-    public ProgressTrackerService(IHubContext<ProgressHub, IProgressReceiver> hubContext)
-    {
-        _hubContext = hubContext;
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        while (!stoppingToken.IsCancellationRequested)
-        {
-            try
-            {
-                var now = DateTime.UtcNow;
-                foreach (var kvp in _taskMap)
-                {
-                    var info = kvp.Value;
-                    // 超过 1 分钟且任务已完成/失败/取消
-                    if ((now - info.UpdatedAt).TotalMinutes > 1 &&
-                        (info.Reporter.Status == ProgressStatus.Completed ||
-                         info.Reporter.Status == ProgressStatus.Failed ||
-                         info.Reporter.Status == ProgressStatus.Canceled))
-                    {
-                        _taskMap.TryRemove(kvp.Key, out _);
-                        logger.Info($"Cleaned up task {kvp.Key}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                logger.Error(ex, "Error during ProgressTracker cleanup");
-            }
-            await Task.Delay(TimeSpan.FromSeconds(30));
-        }
-    }
-
-    public (string, ProgressReporter) CreateTask(CancellationToken? cancellationToken = null)
-    {
-        CancellationTokenSource? cancellationTokenSource;
-        if (cancellationToken.HasValue)
-        {
-            cancellationTokenSource = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken.Value);
-        }
-        else
-        {
-            cancellationTokenSource = new CancellationTokenSource();
-        }
-
-        var progressInfo = new TaskProgressInfo
-        {
-            ConnectionId = null,
-            UpdatedAt = DateTime.UtcNow,
-            CancellationToken = cancellationTokenSource.Token,
-            CancellationTokenSource = cancellationTokenSource,
-        };
-
-        var progress = new ProgressReporter(async value =>
-        {
-            cancellationTokenSource.Token.ThrowIfCancellationRequested();
-
-            // 通过 SignalR 推送进度
-            if (progressInfo.ConnectionId != null)
-                await _hubContext.Clients.Client(progressInfo.ConnectionId).OnReceiveProgress(progressInfo.Reporter);
-        });
-
-        progressInfo.Reporter = progress;
-
-        _taskMap.TryAdd(progressInfo.Reporter.TaskId, progressInfo);
-
-        return (progressInfo.Reporter.TaskId, progress);
-    }
-
-    public Optional<ProgressReporter> GetReporter(string taskId)
-    {
-        if (_taskMap.TryGetValue(taskId, out var info))
-        {
-            return info.Reporter;
-        }
-        return Optional<ProgressReporter>.None;
-    }
-
-    public Optional<ProgressStatus> GetProgressStatus(string taskId)
-    {
-        if (_taskMap.TryGetValue(taskId, out var info))
-        {
-            return info.Reporter.Status;
-        }
-        return Optional<ProgressStatus>.None;
-    }
-
-    public bool BindTask(string taskId, string connectionId)
-    {
-        if (_taskMap.TryGetValue(taskId, out var info) && info != null)
-        {
-            lock (info)
-            {
-                info.ConnectionId = connectionId;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    public bool CancelTask(string taskId)
-    {
-        try
-        {
-            if (_taskMap.TryGetValue(taskId, out var info) && info != null)
-            {
-                lock (info)
-                {
-                    info.CancellationTokenSource.Cancel();
-                    info.Reporter.Cancel();
-                    info.UpdatedAt = DateTime.UtcNow;
-                }
-
-                return true;
-            }
-
-            return false;
-        }
-        catch (Exception ex)
-        {
-            logger.Error(ex, $"Failed to cancel task {taskId}");
-            return false;
-        }
-    }
-}

server/src/UdpClientPool.cs

@@ -3,7 +3,6 @@ using System.Net.Sockets;
 using System.Text;
 using DotNext;
 using WebProtocol;
-using server.Services;
 
 /// <summary>
 /// UDP客户端发送池
@@ -337,7 +336,7 @@ public class UDPClientPool
                         $"Device {address} receive data is {retData.Length} bytes instead of 4 bytes"));
 
                 // Check result
-                var retCode = Convert.ToUInt32(Common.Number.BytesToUInt32(retData).Value);
+                var retCode = Convert.ToUInt32(Common.Number.BytesToUInt64(retData).Value);
                 if (Common.Number.BitsCheck(retCode, result, resultMask)) return true;
             }
             catch (Exception error)
@@ -434,12 +433,11 @@ public class UDPClientPool
     /// <param name="endPoint">IP端点（IP地址与端口）</param>
     /// <param name="taskID">任务ID</param>
     /// <param name="devAddr">设备地址</param>
-    /// <param name="burstType">突发类型</param>
     /// <param name="dataLength">要读取的数据长度（4字节）</param>
     /// <param name="timeout">超时时间（毫秒）</param>
     /// <returns>读取结果，包含接收到的字节数组</returns>
     public static async ValueTask<Result<byte[]>> ReadAddr4BytesAsync(
-        IPEndPoint endPoint, int taskID, UInt32 devAddr, int dataLength, BurstType burstType, int timeout = 1000)
+        IPEndPoint endPoint, int taskID, UInt32 devAddr, int dataLength, int timeout = 1000)
     {
         var pkgList = new List<SendAddrPackage>();
         var resultData = new List<byte>();
@@ -462,12 +460,11 @@ public class UDPClientPool
 
             var opts = new SendAddrPackOptions
             {
-                BurstType = burstType,
+                BurstType = BurstType.FixedBurst,
                 CommandID = Convert.ToByte(taskID),
                 IsWrite = false,
                 BurstLength = (byte)(currentSegmentSize - 1),
-                Address = (burstType == BurstType.ExtendBurst) ? (devAddr + (uint)(i * max4BytesPerRead)) : (devAddr),
+                Address = devAddr + (uint)(i * max4BytesPerRead)
-                // Address = devAddr + (uint)(i * max4BytesPerRead),
             };
             pkgList.Add(new SendAddrPackage(opts));
         }
@@ -587,8 +584,7 @@ public class UDPClientPool
     /// <param name="timeout">超时时间（毫秒）</param>
     /// <returns>写入结果，true表示写入成功</returns>
     public static async ValueTask<Result<bool>> WriteAddr(
-            IPEndPoint endPoint, int taskID, UInt32 devAddr,
+            IPEndPoint endPoint, int taskID, UInt32 devAddr, UInt32 data, int timeout = 1000)
-            UInt32 data, int timeout = 1000, ProgressReporter? progress = null)
     {
         var ret = false;
         var opts = new SendAddrPackOptions()
@@ -599,17 +595,14 @@ public class UDPClientPool
             Address = devAddr,
             IsWrite = true,
         };
-        progress?.Report(20);
 
         // Write Register
         ret = await UDPClientPool.SendAddrPackAsync(endPoint, new SendAddrPackage(opts));
         if (!ret) return new(new Exception("Send 1st address package failed!"));
-        progress?.Report(40);
         // Send Data Package
         ret = await UDPClientPool.SendDataPackAsync(endPoint,
                 new SendDataPackage(Common.Number.NumberToBytes(data, 4).Value));
         if (!ret) return new(new Exception("Send data package failed!"));
-        progress?.Report(60);
 
         // Check Msg Bus
         if (!MsgBus.IsRunning)
@@ -619,7 +612,6 @@ public class UDPClientPool
         var udpWriteAck = await MsgBus.UDPServer.WaitForAckAsync(
                 endPoint.Address.ToString(), taskID, endPoint.Port, timeout);
         if (!udpWriteAck.IsSuccessful) return new(udpWriteAck.Error);
-        progress?.Finish();
 
         return udpWriteAck.Value.IsSuccessful;
     }
@@ -634,8 +626,7 @@ public class UDPClientPool
     /// <param name="timeout">超时时间（毫秒）</param>
     /// <returns>写入结果，true表示写入成功</returns>
     public static async ValueTask<Result<bool>> WriteAddr(
-        IPEndPoint endPoint, int taskID, UInt32 devAddr,
+        IPEndPoint endPoint, int taskID, UInt32 devAddr, byte[] dataArray, int timeout = 1000)
-        byte[] dataArray, int timeout = 1000, ProgressReporter? progress = null)
     {
         var ret = false;
         var opts = new SendAddrPackOptions()
@@ -657,8 +648,6 @@ public class UDPClientPool
         var writeTimes = hasRest ?
             dataArray.Length / (max4BytesPerRead * (32 / 8)) + 1 :
             dataArray.Length / (max4BytesPerRead * (32 / 8));
-        if (progress != null)
-            progress.ExpectedSteps = writeTimes;
         for (var i = 0; i < writeTimes; i++)
         {
             // Sperate Data Array
@@ -687,11 +676,8 @@ public class UDPClientPool
 
             if (!udpWriteAck.Value.IsSuccessful)
                 return false;
-
-            progress?.Increase();
         }
 
-        progress?.Finish();
         return true;
     }
 

src/App.vue

@@ -12,14 +12,6 @@ const isDarkMode = ref(
   window.matchMedia("(prefers-color-scheme: dark)").matches,
 );
 
-// Navbar显示状态管理
-const showNavbar = ref(true);
-
-// 切换Navbar显示状态
-const toggleNavbar = () => {
-  showNavbar.value = !showNavbar.value;
-};
-
 // 初始化主题设置
 onMounted(() => {
   // 应用初始主题
@@ -55,12 +47,6 @@ provide("theme", {
   toggleTheme,
 });
 
-// 提供Navbar控制给子组件
-provide("navbar", {
-  showNavbar,
-  toggleNavbar,
-});
-
 const currentRoutePath = computed(() => {
   return router.currentRoute.value.path;
 });
@@ -70,8 +56,8 @@ useAlertProvider();
 
 <template>
   <div>
-    <header class="relative" :class="{ 'navbar-hidden': !showNavbar }">
+    <header class="relative">
-      <Navbar v-show="showNavbar" />
+      <Navbar />
       <Dialog />
       <Alert />
     </header>
@@ -93,25 +79,4 @@ useAlertProvider();
 
 <style scoped>
 /* 特定于App.vue的样式 */
-header {
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  transform-origin: top;
-}
-
-.navbar-hidden {
-  transform: scaleY(0);
-  height: 0;
-  overflow: hidden;
-}
-
-/* Navbar显示/隐藏动画 */
-header .navbar {
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  transform-origin: top;
-}
-
-/* 当header被隐藏时，确保navbar也相应变化 */
-.navbar-hidden .navbar {
-  opacity: 0;
-}
 </style>

src/TypedSignalR.Client/index.ts

@@ -1,169 +0,0 @@
-/* THIS (.ts) FILE IS GENERATED BY TypedSignalR.Client.TypeScript */
-/* eslint-disable */
-/* tslint:disable */
-// @ts-nocheck
-import type { HubConnection, IStreamResult, Subject } from '@microsoft/signalr';
-import type { IJtagHub, IProgressHub, IJtagReceiver, IProgressReceiver } from './server.Hubs';
-import type { ProgressInfo } from '../server.Hubs';
-
-
-// components
-
-export type Disposable = {
-    dispose(): void;
-}
-
-export type HubProxyFactory<T> = {
-    createHubProxy(connection: HubConnection): T;
-}
-
-export type ReceiverRegister<T> = {
-    register(connection: HubConnection, receiver: T): Disposable;
-}
-
-type ReceiverMethod = {
-    methodName: string,
-    method: (...args: any[]) => void
-}
-
-class ReceiverMethodSubscription implements Disposable {
-
-    public constructor(
-        private connection: HubConnection,
-        private receiverMethod: ReceiverMethod[]) {
-    }
-
-    public readonly dispose = () => {
-        for (const it of this.receiverMethod) {
-            this.connection.off(it.methodName, it.method);
-        }
-    }
-}
-
-// API
-
-export type HubProxyFactoryProvider = {
-    (hubType: "IJtagHub"): HubProxyFactory<IJtagHub>;
-    (hubType: "IProgressHub"): HubProxyFactory<IProgressHub>;
-}
-
-export const getHubProxyFactory = ((hubType: string) => {
-    if(hubType === "IJtagHub") {
-        return IJtagHub_HubProxyFactory.Instance;
-    }
-    if(hubType === "IProgressHub") {
-        return IProgressHub_HubProxyFactory.Instance;
-    }
-}) as HubProxyFactoryProvider;
-
-export type ReceiverRegisterProvider = {
-    (receiverType: "IJtagReceiver"): ReceiverRegister<IJtagReceiver>;
-    (receiverType: "IProgressReceiver"): ReceiverRegister<IProgressReceiver>;
-}
-
-export const getReceiverRegister = ((receiverType: string) => {
-    if(receiverType === "IJtagReceiver") {
-        return IJtagReceiver_Binder.Instance;
-    }
-    if(receiverType === "IProgressReceiver") {
-        return IProgressReceiver_Binder.Instance;
-    }
-}) as ReceiverRegisterProvider;
-
-// HubProxy
-
-class IJtagHub_HubProxyFactory implements HubProxyFactory<IJtagHub> {
-    public static Instance = new IJtagHub_HubProxyFactory();
-
-    private constructor() {
-    }
-
-    public readonly createHubProxy = (connection: HubConnection): IJtagHub => {
-        return new IJtagHub_HubProxy(connection);
-    }
-}
-
-class IJtagHub_HubProxy implements IJtagHub {
-
-    public constructor(private connection: HubConnection) {
-    }
-
-    public readonly setBoundaryScanFreq = async (freq: number): Promise<boolean> => {
-        return await this.connection.invoke("SetBoundaryScanFreq", freq);
-    }
-
-    public readonly startBoundaryScan = async (freq: number): Promise<boolean> => {
-        return await this.connection.invoke("StartBoundaryScan", freq);
-    }
-
-    public readonly stopBoundaryScan = async (): Promise<boolean> => {
-        return await this.connection.invoke("StopBoundaryScan");
-    }
-}
-
-class IProgressHub_HubProxyFactory implements HubProxyFactory<IProgressHub> {
-    public static Instance = new IProgressHub_HubProxyFactory();
-
-    private constructor() {
-    }
-
-    public readonly createHubProxy = (connection: HubConnection): IProgressHub => {
-        return new IProgressHub_HubProxy(connection);
-    }
-}
-
-class IProgressHub_HubProxy implements IProgressHub {
-
-    public constructor(private connection: HubConnection) {
-    }
-
-    public readonly join = async (taskId: string): Promise<boolean> => {
-        return await this.connection.invoke("Join", taskId);
-    }
-}
-
-
-// Receiver
-
-class IJtagReceiver_Binder implements ReceiverRegister<IJtagReceiver> {
-
-    public static Instance = new IJtagReceiver_Binder();
-
-    private constructor() {
-    }
-
-    public readonly register = (connection: HubConnection, receiver: IJtagReceiver): Disposable => {
-
-        const __onReceiveBoundaryScanData = (...args: [Partial<Record<string, boolean>>]) => receiver.onReceiveBoundaryScanData(...args);
-
-        connection.on("OnReceiveBoundaryScanData", __onReceiveBoundaryScanData);
-
-        const methodList: ReceiverMethod[] = [
-            { methodName: "OnReceiveBoundaryScanData", method: __onReceiveBoundaryScanData }
-        ]
-
-        return new ReceiverMethodSubscription(connection, methodList);
-    }
-}
-
-class IProgressReceiver_Binder implements ReceiverRegister<IProgressReceiver> {
-
-    public static Instance = new IProgressReceiver_Binder();
-
-    private constructor() {
-    }
-
-    public readonly register = (connection: HubConnection, receiver: IProgressReceiver): Disposable => {
-
-        const __onReceiveProgress = (...args: [ProgressInfo]) => receiver.onReceiveProgress(...args);
-
-        connection.on("OnReceiveProgress", __onReceiveProgress);
-
-        const methodList: ReceiverMethod[] = [
-            { methodName: "OnReceiveProgress", method: __onReceiveProgress }
-        ]
-
-        return new ReceiverMethodSubscription(connection, methodList);
-    }
-}
-

src/TypedSignalR.Client/server.Hubs.ts

@@ -1,48 +0,0 @@
-/* THIS (.ts) FILE IS GENERATED BY TypedSignalR.Client.TypeScript */
-/* eslint-disable */
-/* tslint:disable */
-// @ts-nocheck
-import type { IStreamResult, Subject } from '@microsoft/signalr';
-import type { ProgressInfo } from '../server.Hubs';
-
-export type IJtagHub = {
-    /**
-    * @param freq Transpiled from int
-    * @returns Transpiled from System.Threading.Tasks.Task<bool>
-    */
-    setBoundaryScanFreq(freq: number): Promise<boolean>;
-    /**
-    * @param freq Transpiled from int
-    * @returns Transpiled from System.Threading.Tasks.Task<bool>
-    */
-    startBoundaryScan(freq: number): Promise<boolean>;
-    /**
-    * @returns Transpiled from System.Threading.Tasks.Task<bool>
-    */
-    stopBoundaryScan(): Promise<boolean>;
-}
-
-export type IProgressHub = {
-    /**
-    * @param taskId Transpiled from string
-    * @returns Transpiled from System.Threading.Tasks.Task<bool>
-    */
-    join(taskId: string): Promise<boolean>;
-}
-
-export type IJtagReceiver = {
-    /**
-    * @param msg Transpiled from System.Collections.Generic.Dictionary<string, bool>
-    * @returns Transpiled from System.Threading.Tasks.Task
-    */
-    onReceiveBoundaryScanData(msg: Partial<Record<string, boolean>>): Promise<void>;
-}
-
-export type IProgressReceiver = {
-    /**
-    * @param message Transpiled from server.Hubs.ProgressInfo
-    * @returns Transpiled from System.Threading.Tasks.Task
-    */
-    onReceiveProgress(message: ProgressInfo): Promise<void>;
-}
-

src/components/Alert/Alert.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="fixed left-1/2 top-30 z-[9999] -translate-x-1/2">
+  <div class="fixed left-1/2 top-30 z-999 -translate-x-1/2">
     <transition
       name="alert"
       enter-active-class="alert-enter-active"

src/components/LabCanvas/DiagramCanvas.vue

@@ -119,7 +119,6 @@
             componentManager.prepareComponentProps(
               component.attrs || {},
               component.id,
-              props.examId,
             )
           "
           @update:bindKey="
@@ -176,7 +175,9 @@ import {
   ref,
   reactive,
   onMounted,
+  onUnmounted,
   computed,
+  watch,
   provide,
 } from "vue";
 import { useEventListener } from "@vueuse/core";
@@ -187,6 +188,7 @@ import { useAlertStore } from "@/components/Alert";
 // 导入 diagram 管理器
 import {
   loadDiagramData,
+  saveDiagramData,
   updatePartPosition,
   updatePartAttribute,
   parseConnectionPin,
@@ -215,7 +217,6 @@ const emit = defineEmits(["toggle-doc-panel", "open-components"]);
 // 定义组件接受的属性
 const props = defineProps<{
   showDocPanel?: boolean; // 添加属性接收文档面板的显示状态
-  examId?: string; // 新增examId属性
 }>();
 
 // 获取componentManager实例
@@ -605,13 +606,14 @@ function onComponentDrag(e: MouseEvent) {
 
 // 停止拖拽组件
 function stopComponentDrag() {
-  // 如果有组件被拖拽，仅清除拖拽状态（不保存）
+  // 如果有组件被拖拽，保存当前状态
   if (draggingComponentId.value) {
     draggingComponentId.value = null;
   }
 
   isComponentDragEventActive.value = false;
-  // 移除自动保存功能 - 不再自动保存到localStorage
+  
+  saveDiagramData(diagramData.value);
 }
 
 // 更新组件属性
@@ -975,8 +977,7 @@ function exportDiagram() {
 onMounted(async () => {
   // 加载图表数据
   try {
-    // 传入examId参数，让diagramManager处理动态加载
+    diagramData.value = await loadDiagramData();
-    diagramData.value = await loadDiagramData(props.examId);
 
     // 预加载所有组件模块
     const componentTypes = new Set<string>();

src/components/LabCanvas/composable/componentManager.ts

@@ -1,6 +1,7 @@
 import { ref, shallowRef, computed, reactive } from "vue";
 import { createInjectionState } from "@vueuse/core";
 import {
+  saveDiagramData,
   type DiagramData,
   type DiagramPart,
 } from "./diagramManager";
@@ -301,7 +302,7 @@ const [useProvideComponentManager, useComponentManager] = createInjectionState(
 
         // 使用 updateDiagramDataDirectly 避免触发加载状态
         canvasInstance.updateDiagramDataDirectly(currentData);
-        // 移除自动保存功能
+        saveDiagramData(currentData);
 
         console.log("组件添加完成:", newComponent);
 
@@ -430,7 +431,7 @@ const [useProvideComponentManager, useComponentManager] = createInjectionState(
           "=== 更新图表数据完成，新组件数量:",
           currentData.parts.length,
         );
-        // 移除自动保存功能
+        saveDiagramData(currentData);
 
         return { success: true, message: `已添加 ${templateData.name} 模板` };
       } else {
@@ -503,7 +504,7 @@ const [useProvideComponentManager, useComponentManager] = createInjectionState(
 
       canvasInstance.updateDiagramDataDirectly(currentData);
 
-      // 移除自动保存功能
+      saveDiagramData(currentData);
     }
 
     /**
@@ -762,15 +763,11 @@ const [useProvideComponentManager, useComponentManager] = createInjectionState(
     function prepareComponentProps(
       attrs: Record<string, any>,
       componentId?: string,
-      examId?: string,
     ): Record<string, any> {
       const result: Record<string, any> = { ...attrs };
       if (componentId) {
         result.componentId = componentId;
       }
-      if (examId) {
-        result.examId = examId;
-      }
       return result;
     }
 

src/components/LabCanvas/composable/diagramManager.ts

@@ -26,8 +26,6 @@ export interface DiagramPart {
 // 连接类型定义 - 使用元组类型表示四元素数组
 export type ConnectionArray = [string, string, number, string[]];
 
-import { AuthManager } from '@/utils/AuthManager';
-
 // 解析连接字符串为组件ID和引脚ID
 export function parseConnectionPin(connectionPin: string): { componentId: string; pinId: string } {
   const [componentId, pinId] = connectionPin.split(':');
@@ -82,62 +80,22 @@ export interface WireItem {
   showLabel: boolean;
 }
 
-// 从本地存储或动态API加载图表数据
+// 从本地存储加载图表数据
-export async function loadDiagramData(examId?: string): Promise<DiagramData> {
+export async function loadDiagramData(): Promise<DiagramData> {
   try {
-    // 如果提供了examId，优先从API加载实验的diagram
+    // 先尝试从本地存储加载
-    if (examId) {
+    const savedData = localStorage.getItem('diagramData');
-      try {
+    if (savedData) {
-        const resourceClient = AuthManager.createAuthenticatedResourceClient();
+      return JSON.parse(savedData);
-        
-        // 获取diagram类型的资源列表
-        const resources = await resourceClient.getResourceList(examId, 'canvas', 'template');
-        
-        if (resources && resources.length > 0) {
-          // 获取第一个diagram资源
-          const diagramResource = resources[0];
-          
-          // 使用动态API获取资源文件内容
-          const response = await resourceClient.getResourceById(diagramResource.id);
-          
-          if (response && response.data) {
-            const text = await response.data.text();
-            const data = JSON.parse(text);
-            
-            // 验证数据格式
-            const validation = validateDiagramData(data);
-            if (validation.isValid) {
-              console.log('成功从API加载实验diagram:', examId);
-              return data;
-            } else {
-              console.warn('API返回的diagram数据格式无效:', validation.errors);
-            }
-          }
-        } else {
-          console.log('未找到实验diagram资源，使用默认加载方式');
-        }
-      } catch (error) {
-        console.warn('从API加载实验diagram失败，使用默认加载方式:', error);
-      }
     }
     
-    // 如果没有examId或API加载失败，尝试从静态文件加载（不再使用本地存储）
+    // 如果本地存储没有，从文件加载
-    
-    // 从静态文件加载（作为备选方案）
     const response = await fetch('/src/components/diagram.json');
     if (!response.ok) {
       throw new Error(`Failed to load diagram.json: ${response.statusText}`);
     }
     const data = await response.json();
-    
-    // 验证静态文件数据
-    const validation = validateDiagramData(data);
-    if (validation.isValid) {
     return data;
-    } else {
-      console.warn('静态diagram文件数据格式无效:', validation.errors);
-      throw new Error('所有diagram数据源都无效');
-    }
   } catch (error) {
     console.error('Error loading diagram data:', error);
     // 返回空的默认数据结构
@@ -156,10 +114,13 @@ export function createEmptyDiagram(): DiagramData {
   };
 }
 
-// 保存图表数据（已禁用本地存储）
+// 保存图表数据到本地存储
 export function saveDiagramData(data: DiagramData): void {
-  // 本地存储功能已禁用 - 不再保存到localStorage
+  try {
-  console.debug('saveDiagramData called but localStorage saving is disabled');
+    localStorage.setItem('diagramData', JSON.stringify(data));
+  } catch (error) {
+    console.error('Error saving diagram data:', error);
+  }
 }
 
 // 更新组件位置

src/components/LogicAnalyzer/LogicAnalyzerManager.ts

@@ -9,8 +9,6 @@ import {
   SignalOperator,
   SignalTriggerConfig,
   SignalValue,
-  AnalyzerChannelDiv,
-  AnalyzerClockDiv,
 } from "@/APIClient";
 import { AuthManager } from "@/utils/AuthManager";
 import { useAlertStore } from "@/components/Alert";
@@ -31,8 +29,16 @@ export type Channel = {
 
 // 全局模式选项
 const globalModes = [
-  {value: GlobalCaptureMode.AND,label: "AND",description: "所有条件都满足时触发",},
+  {
-  {value: GlobalCaptureMode.OR,label: "OR",description: "任一条件满足时触发",},
+    value: GlobalCaptureMode.AND,
+    label: "AND",
+    description: "所有条件都满足时触发",
+  },
+  {
+    value: GlobalCaptureMode.OR,
+    label: "OR",
+    description: "任一条件满足时触发",
+  },
   { value: GlobalCaptureMode.NAND, label: "NAND", description: "AND的非" },
   { value: GlobalCaptureMode.NOR, label: "NOR", description: "OR的非" },
 ];
@@ -59,34 +65,6 @@ const signalValues = [
   { value: SignalValue.SomeNumber, label: "#" },
 ];
 
-// 通道组选项
-const channelDivOptions = [
-  { value: 1, label: "1通道", description: "启用1个通道 (CH0)" },
-  { value: 2, label: "2通道", description: "启用2个通道 (CH0-CH1)" },
-  { value: 4, label: "4通道", description: "启用4个通道 (CH0-CH3)" },
-  { value: 8, label: "8通道", description: "启用8个通道 (CH0-CH7)" },
-  { value: 16, label: "16通道", description: "启用16个通道 (CH0-CH15)" },
-  { value: 32, label: "32通道", description: "启用32个通道 (CH0-CH31)" },
-];
-
-const ClockDivOptions = [
-  { value: AnalyzerClockDiv.DIV1, label: "120MHz", description: "采样频率120MHz" },
-  { value: AnalyzerClockDiv.DIV2, label: "60MHz", description: "采样频率60MHz" },
-  { value: AnalyzerClockDiv.DIV4, label: "30MHz", description: "采样频率30MHz" },
-  { value: AnalyzerClockDiv.DIV8, label: "15MHz", description: "采样频率15MHz" },
-  { value: AnalyzerClockDiv.DIV16, label: "7.5MHz", description: "采样频率7.5MHz" },
-  { value: AnalyzerClockDiv.DIV32, label: "3.75MHz", description: "采样频率3.75MHz" },
-  { value: AnalyzerClockDiv.DIV64, label: "1.875MHz", description: "采样频率1.875MHz" },
-  { value: AnalyzerClockDiv.DIV128, label: "937.5KHz", description: "采样频率937.5KHz" },
-];
-
-// 捕获深度限制常量
-const CAPTURE_LENGTH_MIN = 1024; // 最小捕获深度 1024
-const CAPTURE_LENGTH_MAX = 0x10000000 - 0x01000000; // 最大捕获深度
-
-// 预捕获深度限制常量  
-const PRE_CAPTURE_LENGTH_MIN = 2; // 最小预捕获深度 2
-
 // 默认颜色数组
 const defaultColors = [
   "#FF5733",
@@ -99,8 +77,9 @@ const defaultColors = [
   "#8C33FF",
 ];
 
-// 添加逻辑分析仪基础频率常量
+// 添加逻辑分析仪频率常量
-const BASE_LOGIC_ANALYZER_FREQUENCY = 120_000_000; // 120MHz基础频率
+const LOGIC_ANALYZER_FREQUENCY = 5_000_000; // 5MHz
+const SAMPLE_PERIOD_NS = 1_000_000_000 / LOGIC_ANALYZER_FREQUENCY; // 采样周期，单位：纳秒
 
 const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
   () => {
@@ -112,26 +91,22 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
 
     // 触发设置相关状态
     const currentGlobalMode = ref<GlobalCaptureMode>(GlobalCaptureMode.AND);
-    const currentChannelDiv = ref<number>(8); // 默认启用8个通道
-    const captureLength = ref<number>(CAPTURE_LENGTH_MIN); // 捕获深度，默认为最小值
-    const preCaptureLength = ref<number>(PRE_CAPTURE_LENGTH_MIN); // 预捕获深度，默认0
-    const currentclockDiv = ref<AnalyzerClockDiv>(AnalyzerClockDiv.DIV1); // 默认时钟分频为1
     const isApplying = ref(false);
     const isCapturing = ref(false); // 添加捕获状态标识
 
     // 通道配置
     const channels = reactive<Channel[]>(
-      Array.from({ length: 32 }, (_, index) => ({
+      Array.from({ length: 8 }, (_, index) => ({
-        enabled: index < 8, // 默认启用前8个通道
+        enabled: false,
         label: `CH${index}`,
-        color: defaultColors[index % defaultColors.length], // 使用模运算避免数组越界
+        color: defaultColors[index],
       })),
     );
 
-    // 32个信号通道的配置
+    // 8个信号通道的配置
     const signalConfigs = reactive<SignalTriggerConfig[]>(
       Array.from(
-        { length: 32 },
+        { length: 8 },
         (_, index) =>
           new SignalTriggerConfig({
             signalIndex: index,
@@ -156,128 +131,101 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
       channels.filter((channel) => channel.enabled),
     );
 
-    // 计算属性：根据当前时钟分频获取实际采样频率
+    const enableAllChannels = () => {
-    const currentSampleFrequency = computed(() => {
+      channels.forEach((channel) => {
-      const divValue = Math.pow(2, currentclockDiv.value);
+        channel.enabled = true;
-      return BASE_LOGIC_ANALYZER_FREQUENCY / divValue;
       });
-
-    // 计算属性：获取当前采样周期（纳秒）
-    const currentSamplePeriodNs = computed(() => {
-      return 1_000_000_000 / currentSampleFrequency.value;
-    });
-
-    // 转换通道数字到枚举值
-    const getChannelDivEnum = (channelCount: number): AnalyzerChannelDiv => {
-      switch (channelCount) {
-        case 1: return AnalyzerChannelDiv.ONE;
-        case 2: return AnalyzerChannelDiv.TWO;
-        case 4: return AnalyzerChannelDiv.FOUR;
-        case 8: return AnalyzerChannelDiv.EIGHT;
-        case 16: return AnalyzerChannelDiv.XVI;
-        case 32: return AnalyzerChannelDiv.XXXII;
-        default: return AnalyzerChannelDiv.EIGHT;
-      }
     };
 
-    // 验证捕获深度
+    const disableAllChannels = () => {
-    const validateCaptureLength = (value: number): { valid: boolean; message?: string } => {
-      if (!Number.isInteger(value)) {
-        return { valid: false, message: "捕获深度必须是整数" };
-      }
-      if (value < CAPTURE_LENGTH_MIN) {
-        return { valid: false, message: `捕获深度不能小于 ${CAPTURE_LENGTH_MIN}` };
-      }
-      if (value > CAPTURE_LENGTH_MAX) {
-        return { valid: false, message: `捕获深度不能大于 ${CAPTURE_LENGTH_MAX.toLocaleString()}` };
-      }
-      return { valid: true };
-    };
-
-    // 验证预捕获深度
-    const validatePreCaptureLength = (value: number, currentCaptureLength: number): { valid: boolean; message?: string } => {
-      if (!Number.isInteger(value)) {
-        return { valid: false, message: "预捕获深度必须是整数" };
-      }
-      if (value < PRE_CAPTURE_LENGTH_MIN) {
-        return { valid: false, message: `预捕获深度不能小于 ${PRE_CAPTURE_LENGTH_MIN}` };
-      }
-      if (value >= currentCaptureLength) {
-        return { valid: false, message: `预捕获深度不能大于等于捕获深度 (${currentCaptureLength})` };
-      }
-      return { valid: true };
-    };
-
-    // 设置捕获深度
-    const setCaptureLength = (value: number) => {
-      const validation = validateCaptureLength(value);
-      if (!validation.valid) {
-        alert?.error(validation.message!, 3000);
-        return false;
-      }
-      
-      // 检查预捕获深度是否仍然有效
-      if (preCaptureLength.value >= value) {
-        preCaptureLength.value = Math.max(0, value - 1);
-        alert?.warn(`预捕获深度已自动调整为 ${preCaptureLength.value}`, 3000);
-      }
-      
-      captureLength.value = value;
-      return true;
-    };
-
-    // 设置预捕获深度
-    const setPreCaptureLength = (value: number) => {
-      const validation = validatePreCaptureLength(value, captureLength.value);
-      if (!validation.valid) {
-        alert?.error(validation.message!, 3000);
-        return false;
-      }
-      
-      preCaptureLength.value = value;
-      return true;
-    };
-
-    // 设置通道组
-    const setChannelDiv = (channelCount: number) => {
-      // 验证通道数量是否有效
-      if (!channelDivOptions.find(option => option.value === channelCount)) {
-        console.error(`无效的通道组设置: ${channelCount}`);
-        return;
-      }
-      currentChannelDiv.value = channelCount;
-      
-      // 禁用所有通道
       channels.forEach((channel) => {
         channel.enabled = false;
       });
+    };
 
-      // 启用指定数量的通道（从CH0开始）
+    const setGlobalMode = async (mode: GlobalCaptureMode) => {
-      for (let i = 0; i < channelCount && i < channels.length; i++) {
+      // 检查是否有其他操作正在进行
-        channels[i].enabled = true;
+      if (operationMutex.isLocked()) {
+        alert.warn("有其他操作正在进行中，请稍后再试", 3000);
+        return;
       }
 
-      const option = channelDivOptions.find(opt => opt.value === channelCount);
+      const release = await operationMutex.acquire();
-      alert?.success(`已设置为${option?.label}`, 2000);
+      try {
-    };
+        const client = AuthManager.createAuthenticatedLogicAnalyzerClient();
+        const success = await client.setGlobalTrigMode(mode);
 
-    const setGlobalMode = (mode: GlobalCaptureMode) => {
+        if (success) {
           currentGlobalMode.value = mode;
-      const modeOption = globalModes.find((m) => m.value === mode);
+          alert?.success(
-      alert?.info(`全局触发模式已设置为 ${modeOption?.label}`, 2000);
+            `全局触发模式已设置为 ${globalModes.find((m) => m.value === mode)?.label}`,
+            3000,
+          );
+        } else {
+          throw new Error("设置失败");
+        }
+      } catch (error) {
+        console.error("设置全局触发模式失败:", error);
+        alert?.error("设置全局触发模式失败", 3000);
+      } finally {
+        release();
+      }
     };
 
-    const setClockDiv = (mode: AnalyzerClockDiv) => {
+    const applyConfiguration = async () => {
-      currentclockDiv.value = mode;
+      // 检查是否有其他操作正在进行
-      const modeOption = ClockDivOptions.find((m) => m.value === mode);
+      if (operationMutex.isLocked()) {
-      alert?.info(`时钟分频已设置为 ${modeOption?.label}`, 2000);
+        alert.warn("有其他操作正在进行中，请稍后再试", 3000);
+        return;
+      }
+
+      const release = await operationMutex.acquire();
+      isApplying.value = true;
+
+      try {
+        const client = AuthManager.createAuthenticatedLogicAnalyzerClient();
+
+        // 准备配置数据 - 只包含启用的通道
+        const enabledSignals = signalConfigs.filter(
+          (signal, index) => channels[index].enabled,
+        );
+
+        const config = new CaptureConfig({
+          globalMode: currentGlobalMode.value,
+          signalConfigs: enabledSignals,
+        });
+
+        // 发送配置
+        const success = await client.configureCapture(config);
+
+        if (success) {
+          const enabledChannelCount = channels.filter(
+            (ch) => ch.enabled,
+          ).length;
+          alert?.success(
+            `配置已成功应用，启用了 ${enabledChannelCount} 个通道和触发条件`,
+            3000,
+          );
+        } else {
+          throw new Error("应用配置失败");
+        }
+      } catch (error) {
+        console.error("应用配置失败:", error);
+        alert?.error("应用配置失败，请检查设备连接", 3000);
+      } finally {
+        isApplying.value = false;
+        release();
+      }
     };
 
     const resetConfiguration = () => {
       currentGlobalMode.value = GlobalCaptureMode.AND;
-      currentChannelDiv.value = 8; // 重置为默认的8通道
+
-      currentclockDiv.value = AnalyzerClockDiv.DIV1; // 重置为默认采样频率
+      channels.forEach((channel, index) => {
-      setChannelDiv(8); // 重置为默认的8通道
+        channel.enabled = false;
+        channel.label = `CH${index}`;
+        channel.color = defaultColors[index];
+      });
 
       signalConfigs.forEach((signal) => {
         signal.operator = SignalOperator.Equal;
@@ -295,120 +243,28 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
     const getCaptureData = async () => {
       try {
         const client = AuthManager.createAuthenticatedLogicAnalyzerClient();
-        // 获取捕获数据，使用当前设置的捕获长度
+        // 3. 获取捕获数据
-        const base64Data = await client.getCaptureData(captureLength.value);
+        const base64Data = await client.getCaptureData();
 
-        // 将base64数据转换为bytes
+        // 4. 将base64数据转换为bytes
         const binaryString = atob(base64Data);
         const bytes = new Uint8Array(binaryString.length);
         for (let i = 0; i < binaryString.length; i++) {
           bytes[i] = binaryString.charCodeAt(i);
         }
 
-        // 根据当前通道数量解析数据
+        // 5. 解析数据为8个通道的数字信号
-        const channelCount = currentChannelDiv.value;
+        const sampleCount = bytes.length;
-        const timeStepNs = currentSamplePeriodNs.value;
+        const timeStepNs = SAMPLE_PERIOD_NS; // 每个采样点间隔200ns (1/5MHz)
 
-        let sampleCount: number;
+        // 创建时间轴（转换为合适的单位）
-        let x: number[];
+        const x = Array.from(
-        let y: number[][];
-
-        if (channelCount === 1) {
-          // 1通道：每个字节包含8个时间单位的数据
-          sampleCount = bytes.length * 8;
-          
-          // 创建时间轴
-          x = Array.from(
-            { length: sampleCount },
-            (_, i) => (i * timeStepNs) / 1000,
-          ); // 转换为微秒
-          
-          // 创建通道数据数组
-          y = Array.from(
-            { length: 1 },
-            () => new Array(sampleCount),
-          );
-          
-          // 解析数据：每个字节的8个位对应8个时间单位
-          for (let byteIndex = 0; byteIndex < bytes.length; byteIndex++) {
-            const byte = bytes[byteIndex];
-            for (let bitIndex = 0; bitIndex < 8; bitIndex++) {
-              const timeIndex = byteIndex * 8 + bitIndex;
-              y[0][timeIndex] = (byte >> bitIndex) & 1;
-            }
-          }
-        } else if (channelCount === 2) {
-          // 2通道：每个字节包含4个时间单位的数据
-          sampleCount = bytes.length * 4;
-          
-          // 创建时间轴
-          x = Array.from(
-            { length: sampleCount },
-            (_, i) => (i * timeStepNs) / 1000,
-          ); // 转换为微秒
-          
-          // 创建通道数据数组
-          y = Array.from(
-            { length: 2 },
-            () => new Array(sampleCount),
-          );
-          
-          // 解析数据：每个字节的8个位对应4个时间单位的2通道数据
-          // 位分布：[T3_CH1, T3_CH0, T2_CH1, T2_CH0, T1_CH1, T1_CH0, T0_CH1, T0_CH0]
-          for (let byteIndex = 0; byteIndex < bytes.length; byteIndex++) {
-            const byte = bytes[byteIndex];
-            for (let timeUnit = 0; timeUnit < 4; timeUnit++) {
-              const timeIndex = byteIndex * 4 + timeUnit;
-              const bitOffset = timeUnit * 2;
-              y[0][timeIndex] = (byte >> bitOffset) & 1;       // CH0
-              y[1][timeIndex] = (byte >> (bitOffset + 1)) & 1; // CH1
-            }
-          }
-        } else if (channelCount === 4) {
-          // 4通道：每个字节包含2个时间单位的数据
-          sampleCount = bytes.length * 2;
-          
-          // 创建时间轴
-          x = Array.from(
-            { length: sampleCount },
-            (_, i) => (i * timeStepNs) / 1000,
-          ); // 转换为微秒
-          
-          // 创建通道数据数组
-          y = Array.from(
-            { length: 4 },
-            () => new Array(sampleCount),
-          );
-          
-          // 解析数据：每个字节的8个位对应2个时间单位的4通道数据
-          // 位分布：[T1_CH3, T1_CH2, T1_CH1, T1_CH0, T0_CH3, T0_CH2, T0_CH1, T0_CH0]
-          for (let byteIndex = 0; byteIndex < bytes.length; byteIndex++) {
-            const byte = bytes[byteIndex];
-            
-            // 处理第一个时间单位（低4位）
-            const timeIndex1 = byteIndex * 2;
-            for (let channel = 0; channel < 4; channel++) {
-              y[channel][timeIndex1] = (byte >> channel) & 1;
-            }
-            
-            // 处理第二个时间单位（高4位）
-            const timeIndex2 = byteIndex * 2 + 1;
-            for (let channel = 0; channel < 4; channel++) {
-              y[channel][timeIndex2] = (byte >> (channel + 4)) & 1;
-            }
-          }
-        } else if (channelCount === 8) {
-          // 8通道：每个字节包含1个时间单位的8个通道数据
-          sampleCount = bytes.length;
-          
-          // 创建时间轴
-          x = Array.from(
           { length: sampleCount },
           (_, i) => (i * timeStepNs) / 1000,
         ); // 转换为微秒
 
         // 创建8个通道的数据
-          y = Array.from(
+        const y: number[][] = Array.from(
           { length: 8 },
           () => new Array(sampleCount),
         );
@@ -421,97 +277,17 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
             y[channel][i] = (byte >> channel) & 1;
           }
         }
-        } else if (channelCount === 16) {
-          // 16通道：每2个字节包含1个时间单位的16个通道数据
-          sampleCount = bytes.length / 2;
 
-          // 创建时间轴
+        // 6. 设置逻辑数据
-          x = Array.from(
-            { length: sampleCount },
-            (_, i) => (i * timeStepNs) / 1000,
-          ); // 转换为微秒
-          
-          // 创建16个通道的数据
-          y = Array.from(
-            { length: 16 },
-            () => new Array(sampleCount),
-          );
-          
-          // 解析数据：每2个字节为一个时间单位
-          for (let timeIndex = 0; timeIndex < sampleCount; timeIndex++) {
-            const byteIndex = timeIndex * 2;
-            const byte1 = bytes[byteIndex];     // [7:0]
-            const byte2 = bytes[byteIndex + 1]; // [15:8]
-            
-            // 处理低8位通道 [7:0]
-            for (let channel = 0; channel < 8; channel++) {
-              y[channel][timeIndex] = (byte1 >> channel) & 1;
-            }
-            
-            // 处理高8位通道 [15:8]
-            for (let channel = 0; channel < 8; channel++) {
-              y[channel + 8][timeIndex] = (byte2 >> channel) & 1;
-            }
-          }
-        } else if (channelCount === 32) {
-          // 32通道：每4个字节包含1个时间单位的32个通道数据
-          sampleCount = bytes.length / 4;
-          
-          // 创建时间轴
-          x = Array.from(
-            { length: sampleCount },
-            (_, i) => (i * timeStepNs) / 1000,
-          ); // 转换为微秒
-          
-          // 创建32个通道的数据
-          y = Array.from(
-            { length: 32 },
-            () => new Array(sampleCount),
-          );
-          
-          // 解析数据：每4个字节为一个时间单位
-          for (let timeIndex = 0; timeIndex < sampleCount; timeIndex++) {
-            const byteIndex = timeIndex * 4;
-            const byte1 = bytes[byteIndex];     // [7:0]
-            const byte2 = bytes[byteIndex + 1]; // [15:8]
-            const byte3 = bytes[byteIndex + 2]; // [23:16]
-            const byte4 = bytes[byteIndex + 3]; // [31:24]
-            
-            // 处理 [7:0]
-            for (let channel = 0; channel < 8; channel++) {
-              y[channel][timeIndex] = (byte1 >> channel) & 1;
-            }
-            
-            // 处理 [15:8]
-            for (let channel = 0; channel < 8; channel++) {
-              y[channel + 8][timeIndex] = (byte2 >> channel) & 1;
-            }
-            
-            // 处理 [23:16]
-            for (let channel = 0; channel < 8; channel++) {
-              y[channel + 16][timeIndex] = (byte3 >> channel) & 1;
-            }
-            
-            // 处理 [31:24]
-            for (let channel = 0; channel < 8; channel++) {
-              y[channel + 24][timeIndex] = (byte4 >> channel) & 1;
-            }
-          }
-        } else {
-          throw new Error(`不支持的通道数量: ${channelCount}`);
-        }
-
-        // 设置逻辑数据
         const logicData: LogicDataType = {
           x,
           y,
-          xUnit: "us", // 微秒单位
+          xUnit: "us", // 改为微秒单位
         };
 
         setLogicData(logicData);
       } catch (error) {
         console.error("获取捕获数据失败:", error);
-        alert?.error("获取捕获数据失败", 3000);
       }
     };
 
@@ -527,46 +303,7 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
       try {
         const client = AuthManager.createAuthenticatedLogicAnalyzerClient();
 
-        // 1. 先应用配置
+        // 1. 设置捕获模式为开始捕获
-        alert?.info("正在应用配置...", 2000);
-        
-        // 准备配置数据 - 包含所有32个通道，未启用的通道设置为默认值
-        const allSignals = signalConfigs.map((signal, index) => {
-          if (channels[index].enabled) {
-            // 启用的通道使用用户配置的触发条件
-            return signal;
-          } else {
-            // 未启用的通道设置为默认触发条件
-            return new SignalTriggerConfig({
-              signalIndex: index,
-              operator: SignalOperator.Equal,
-              value: SignalValue.NotCare,
-            });
-          }
-        });
-
-        const config = new CaptureConfig({
-          globalMode: currentGlobalMode.value,
-          channelDiv: getChannelDivEnum(currentChannelDiv.value),
-          captureLength: captureLength.value,
-          preCaptureLength: preCaptureLength.value,
-          clockDiv: currentclockDiv.value,
-          signalConfigs: allSignals,
-        });
-
-        // 发送配置
-        const configSuccess = await client.configureCapture(config);
-        if (!configSuccess) {
-          throw new Error("配置应用失败");
-        }
-
-        const enabledChannelCount = channels.filter((ch) => ch.enabled).length;
-        alert?.success(
-          `配置已应用，启用了 ${enabledChannelCount} 个通道，捕获深度: ${captureLength.value}`,
-          2000,
-        );
-
-        // 2. 设置捕获模式为开始捕获
         const captureStarted = await client.setCaptureMode(true, false);
         if (!captureStarted) {
           throw new Error("无法启动捕获");
@@ -574,7 +311,7 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
 
         alert?.info("开始捕获信号...", 2000);
 
-        // 3. 轮询捕获状态
+        // 2. 轮询捕获状态
         let captureCompleted = false;
         while (isCapturing.value) {
           const status = await client.getCaptureStatus();
@@ -653,11 +390,8 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
     };
 
     const forceCapture = async () => {
-      // 检查是否正在捕获
+      // 设置捕获状态为false，这会使轮询停止
-      if (!isCapturing.value) {
+      isCapturing.value = false;
-        alert.warn("当前没有正在进行的捕获操作", 2000);
-        return;
-      }
 
       const release = await operationMutex.acquire();
       try {
@@ -670,7 +404,7 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
         }
 
         await getCaptureData();
-        alert.success(`强制捕获完成！`, 3000);
+        alert.success(`捕获完成！`, 3000);
       } catch (error) {
         console.error("强制捕获失败:", error);
         alert.error(
@@ -689,13 +423,13 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
 
     // 添加生成测试数据的方法
     const generateTestData = () => {
-      const sampleRate = currentSampleFrequency.value; // 使用当前设置的采样频率
+      const sampleRate = LOGIC_ANALYZER_FREQUENCY; // 使用实际的逻辑分析仪频率
       const duration = 0.001; // 1ms的数据
       const points = Math.floor(sampleRate * duration);
 
       const x = Array.from(
         { length: points },
-        (_, i) => (i * currentSamplePeriodNs.value) / 1000, // 时间轴，单位：微秒
+        (_, i) => (i * SAMPLE_PERIOD_NS) / 1000, // 时间轴，单位：微秒
       );
 
       // Generate 8 channels with different digital patterns
@@ -753,7 +487,7 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
       });
 
       // 设置逻辑数据
-      setChannelDiv(8);
+      enableAllChannels();
       setLogicData({ x, y, xUnit: "us" }); // 改为微秒单位
 
       alert?.success("测试数据生成成功", 2000);
@@ -765,10 +499,6 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
 
       // 触发设置状态
       currentGlobalMode,
-      currentChannelDiv, // 导出当前通道组状态
-      captureLength, // 导出捕获深度
-      preCaptureLength, // 导出预捕获深度
-      currentclockDiv, // 导出当前采样频率状态
       isApplying,
       isCapturing, // 导出捕获状态
       isOperationInProgress, // 导出操作进行状态
@@ -777,29 +507,17 @@ const [useProvideLogicAnalyzer, useLogicAnalyzerState] = createInjectionState(
       enabledChannelCount,
       channelNames,
       enabledChannels,
-      currentSampleFrequency, // 导出当前采样频率
-      currentSamplePeriodNs, // 导出当前采样周期
 
       // 选项数据
       globalModes,
       operators,
       signalValues,
-      channelDivOptions, // 导出通道组选项
-      ClockDivOptions, // 导出采样频率选项
-
-      // 捕获深度常量和验证
-      CAPTURE_LENGTH_MIN,
-      CAPTURE_LENGTH_MAX,
-      PRE_CAPTURE_LENGTH_MIN,
-      validateCaptureLength,
-      validatePreCaptureLength,
-      setCaptureLength,
-      setPreCaptureLength,
 
       // 触发设置方法
-      setChannelDiv, // 导出设置通道组方法
+      enableAllChannels,
+      disableAllChannels,
       setGlobalMode,
-      setClockDiv, // 导出设置采样频率方法
+      applyConfiguration,
       resetConfiguration,
       setLogicData,
       startCapture,

src/components/LogicAnalyzer/LogicalWaveFormDisplay.vue

@@ -21,7 +21,60 @@
         <h3 class="text-xl font-semibold text-slate-600 mb-2">
           暂无逻辑分析数据
         </h3>
+        <p class="text-sm text-slate-500">点击下方按钮生成测试数据用于观察</p>
       </div>
+
+      <!-- <button
+        class="group relative px-8 py-3 bg-gradient-to-r from-blue-500 to-purple-600 hover:from-blue-600 hover:to-purple-700 text-white font-medium rounded-lg shadow-lg hover:shadow-xl transform hover:scale-105 transition-all duration-200 ease-in-out focus:outline-none focus:ring-4 focus:ring-blue-300 active:scale-95"
+        @click="analyzer.generateTestData"
+      >
+        <span class="flex items-center gap-2">
+          <RefreshCcw
+            class="w-5 h-5 group-hover:rotate-180 transition-transform duration-300"
+          />
+          生成测试数据
+        </span>
+        <div
+          class="absolute inset-0 bg-white opacity-0 group-hover:opacity-20 rounded-lg transition-opacity duration-200"
+        ></div>
+      </button> -->
+      <button
+        class="group relative px-8 py-3 bg-gradient-to-r text-white font-medium rounded-lg shadow-lg hover:shadow-xl transform hover:scale-105 transition-all duration-200 ease-in-out focus:outline-none focus:ring-4 active:scale-95"
+        :class="{
+          'from-blue-500 to-purple-600 hover:from-blue-600 hover:to-purple-700 focus:ring-blue-300':
+            !analyzer.isCapturing.value,
+          'from-red-500 to-red-600 hover:from-red-600 hover:to-red-700 focus:ring-red-300':
+            analyzer.isCapturing.value,
+        }"
+        @click="
+          analyzer.isCapturing.value
+            ? analyzer.stopCapture()
+            : analyzer.startCapture()
+        "
+      >
+        <span class="flex items-center gap-2">
+          <template v-if="analyzer.isCapturing.value">
+            <Square class="w-5 h-5" />
+            停止捕获
+          </template>
+          <template v-else>
+            <Play class="w-5 h-5" />
+            开始捕获
+          </template>
+        </span>
+      </button>
+
+      <!-- 强制捕获按钮 - 只在正在捕获时显示 -->
+      <button
+        v-if="analyzer.isCapturing.value"
+        class="group relative px-8 py-3 bg-gradient-to-r from-orange-500 to-orange-600 hover:from-orange-600 hover:to-orange-700 text-white font-medium rounded-lg shadow-lg hover:shadow-xl transform hover:scale-105 transition-all duration-200 ease-in-out focus:outline-none focus:ring-4 focus:ring-orange-300 active:scale-95"
+        @click="analyzer.forceCapture()"
+      >
+        <span class="flex items-center gap-2">
+          <Square class="w-5 h-5" />
+          强制捕获
+        </span>
+      </button>
     </div>
   </div>
 </template>
@@ -29,6 +82,7 @@
 <script setup lang="ts">
 import { computed, shallowRef } from "vue";
 import VChart from "vue-echarts";
+import { RefreshCcw, Play, Square } from "lucide-vue-next";
 
 // Echarts
 import { use } from "echarts/core";

src/components/LogicAnalyzer/TriggerSettings.vue

@@ -1,260 +1,132 @@
 <template>
   <div class="space-y-6">
+    <!-- 通道状态概览 -->
+    <div class="stats stats-horizontal bg-base-100 shadow flex justify-between">
+      <div class="stat">
+        <div class="stat-title">总通道数</div>
+        <div class="stat-value text-primary">8</div>
+        <div class="stat-desc">逻辑分析仪通道</div>
+      </div>
+
+      <div class="stat">
+        <div class="stat-title">启用通道</div>
+        <div class="stat-value text-success">{{ enabledChannelCount }}</div>
+        <div class="stat-desc">当前激活通道</div>
+      </div>
+
+      <div class="stat">
+        <div class="stat-title">采样率</div>
+        <div class="stat-value text-info">5MHz</div>
+        <div class="stat-desc">最大采样频率</div>
+      </div>
+    </div>
+
     <!-- 通道配置 -->
     <div class="form-control">
-      <!-- 全局触发模式选择和通道组配置 -->
+      <!-- 全局触发模式选择 -->
-      <div class="flex flex-col gap-6 my-4 mx-2">
+      <div class="flex flex-row justify-between my-4 mx-2">
-        <div class="flex flex-col lg:flex-row gap-6">
+        <div class="flex flex-row gap-4">
-          <div class="flex flex-col gap-2">
+          <label class="label">
-            <label class="block text-sm font-semibold antialiased">
+            <span class="label-text text-sm">全局触发逻辑</span>
-              全局触发逻辑
           </label>
-            <div class="relative w-[200px]">
+          <select
-              <button 
+            v-model="currentGlobalMode"
-                tabindex="0" 
+            @change="setGlobalMode(currentGlobalMode)"
-                type="button" 
+            class="select select-sm select-bordered w-full"
-                class="flex items-center gap-4 justify-between h-max outline-none focus:outline-none bg-transparent ring-transparent border border-slate-200 transition-all duration-300 ease-in disabled:opacity-50 disabled:pointer-events-none select-none text-start text-sm rounded-md py-2 px-2.5 ring shadow-sm hover:border-slate-800 hover:ring-slate-800/10 focus:border-slate-800 focus:ring-slate-800/10 w-full"
-                @click="toggleGlobalModeDropdown"
-                :aria-expanded="showGlobalModeDropdown"
-                aria-haspopup="listbox" 
-                role="combobox"
           >
-                <span>{{ currentGlobalModeLabel }}</span>
+            <option
-                <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" color="currentColor" class="h-[1em] w-[1em] translate-x-0.5 stroke-[1.5]">
-                  <path d="M17 8L12 3L7 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
-                  <path d="M17 16L12 21L7 16" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
-                </svg>
-              </button>
-              <input readonly style="display:none" :value="currentGlobalMode" />
-              <!-- 下拉菜单 -->
-              <div v-if="showGlobalModeDropdown" class="absolute top-full left-0 right-0 mt-1 bg-white border border-slate-200 rounded-md shadow-lg z-50">
-                <div
               v-for="mode in globalModes"
               :key="mode.value"
-                  @click="selectGlobalMode(mode.value)"
+              :value="mode.value"
-                  class="px-3 py-2 text-sm text-slate-700 hover:bg-slate-100 cursor-pointer"
-                  :class="{ 'bg-slate-100': mode.value === currentGlobalMode }"
             >
-                  {{ mode.label }}
+              {{ mode.label }} - {{ mode.description }}
+            </option>
+          </select>
         </div>
-              </div>
+
-            </div>
+        <div class="flex flex-row gap-4">
-            <p class="flex items-center text-xs text-slate-400">
+          <button @click="toggleAllChannels" class="btn btn-primary btn-sm">
-              {{ currentGlobalModeDescription }}
+            {{ enabledChannelCount > 0 ? "全部禁用" : "全部启用" }}
-            </p>
-          </div>
-          <div class="flex flex-col gap-2">
-            <label class="block text-sm font-semibold antialiased">
-              通道组
-            </label>
-            <div class="relative w-[200px]">
-              <button 
-                tabindex="0" 
-                type="button" 
-                class="flex items-center gap-4 justify-between h-max outline-none focus:outline-none bg-transparent ring-transparent border border-slate-200 transition-all duration-300 ease-in disabled:opacity-50 disabled:pointer-events-none select-none text-start text-sm rounded-md py-2 px-2.5 ring shadow-sm hover:border-slate-800 hover:ring-slate-800/10 focus:border-slate-800 focus:ring-slate-800/10 w-full"
-                @click="toggleChannelDivDropdown"
-                :aria-expanded="showChannelDivDropdown"
-                aria-haspopup="listbox" 
-                role="combobox"
-              >
-                <span>{{ currentChannelDivLabel }}</span>
-                <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" color="currentColor" class="h-[1em] w-[1em] translate-x-0.5 stroke-[1.5]">
-                  <path d="M17 8L12 3L7 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
-                  <path d="M17 16L12 21L7 16" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
-                </svg>
           </button>
-              <input readonly style="display:none" :value="currentChannelDiv" />
-              <!-- 下拉菜单 -->
-              <div v-if="showChannelDivDropdown" class="absolute top-full left-0 right-0 mt-1 bg-white border border-slate-200 rounded-md shadow-lg z-50">
-                <div
-                  v-for="option in channelDivOptions"
-                  :key="option.value"
-                  @click="selectChannelDiv(option.value)"
-                  class="px-3 py-2 text-sm text-slate-700 hover:bg-slate-100 cursor-pointer"
-                  :class="{ 'bg-slate-100': option.value === currentChannelDiv }"
-                >
-                  {{ option.label }}
-                </div>
-              </div>
-            </div>
-            <p class="flex items-center text-xs text-slate-400">
-              {{ currentChannelDivDescription }}
-            </p>
-          </div>
-          <div class="flex flex-col gap-2">
-            <label class="block text-sm font-semibold antialiased text-slate-800">
-              采样频率
-            </label>
-            <div class="relative w-[200px]">
           <button
-                tabindex="0" 
+            @click="applyConfiguration"
-                type="button" 
+            :disabled="isApplying"
-                class="flex items-center gap-4 justify-between h-max outline-none focus:outline-none text-slate-600 bg-transparent ring-transparent border border-slate-200 transition-all duration-300 ease-in disabled:opacity-50 disabled:pointer-events-none select-none text-start text-sm rounded-md py-2 px-2.5 ring shadow-sm hover:border-slate-800 hover:ring-slate-800/10 focus:border-slate-800 focus:ring-slate-800/10 w-full"
+            class="btn btn-primary btn-sm"
-                @click="toggleClockDivDropdown"
-                :aria-expanded="showClockDivDropdown"
-                aria-haspopup="listbox" 
-                role="combobox"
           >
-                <span>{{ currentClockDivLabel }}</span>
+            <span
-                <svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" color="currentColor" class="h-[1em] w-[1em] translate-x-0.5 stroke-[1.5]">
+              v-if="isApplying"
-                  <path d="M17 8L12 3L7 8" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
+              class="loading loading-spinner loading-sm"
-                  <path d="M17 16L12 21L7 16" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path>
+            ></span>
-                </svg>
+            应用配置
           </button>
-              <input readonly style="display:none" :value="currentclockDiv" />
+
-              <!-- 下拉菜单 -->
+          <button @click="resetConfiguration" class="btn btn-outline btn-sm">
-              <div v-if="showClockDivDropdown" class="absolute top-full left-0 right-0 mt-1 bg-white border border-slate-200 rounded-md shadow-lg z-50">
+            重置
-                <div
-                  v-for="option in ClockDivOptions"
-                  :key="option.value"
-                  @click="selectClockDiv(option.value)"
-                  class="px-3 py-2 text-sm text-slate-700 hover:bg-slate-100 cursor-pointer"
-                  :class="{ 'bg-slate-100': option.value === currentclockDiv }"
-                >
-                  {{ option.label }}
-                </div>
-              </div>
-            </div>
-            <p class="flex items-center text-xs text-slate-400">
-              {{ currentClockDivDescription }}
-            </p>
-          </div>
-          <div class="flex flex-col gap-2">
-            <label class="block text-sm font-semibold antialiased">
-              捕获深度
-            </label>
-            <div class="relative w-[200px]">
-              <button 
-                @click="decreaseCaptureLength"
-                class="absolute right-9 top-1 rounded-md border border-transparent p-1.5 text-center text-sm transition-all hover:bg-slate-100 focus:bg-slate-100 active:bg-slate-100 disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none" 
-                type="button"
-                :disabled="captureLength <= CAPTURE_LENGTH_MIN"
-              >
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4">
-                  <path d="M3.75 7.25a.75.75 0 0 0 0 1.5h8.5a.75.75 0 0 0 0-1.5h-8.5Z" />
-                </svg>
           </button>
-              <input 
-                v-model.number="captureLength"
-                @change="handleCaptureLengthChange"
-                type="number" 
-                :min="CAPTURE_LENGTH_MIN"
-                :max="CAPTURE_LENGTH_MAX"
-                class="w-full bg-transparent placeholder:text-sm border border-slate-200 rounded-md pl-3 pr-20 py-2 transition duration-300 ease focus:outline-none focus:border-slate-400 ring ring-transparent hover:ring-slate-800/10 focus:ring-slate-800/10 hover:border-slate-800 shadow-sm focus:shadow appearance-none [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none" 
-                :placeholder="CAPTURE_LENGTH_MIN.toString()"
-              />
-              <button 
-                @click="increaseCaptureLength"
-                class="absolute right-1 top-1 rounded-md border border-transparent p-1.5 text-center text-sm transition-all hover:bg-slate-100 focus:bg-slate-100 active:bg-slate-100 disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none" 
-                type="button"
-                :disabled="captureLength >= CAPTURE_LENGTH_MAX"
-              >
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4">
-                  <path d="M8.75 3.75a.75.75 0 0 0-1.5 0v3.5h-3.5a.75.75 0 0 0 0 1.5h3.5v3.5a.75.75 0 0 0 1.5 0v-3.5h3.5a.75.75 0 0 0 0-1.5h-3.5v-3.5Z" />
-                </svg>
-              </button>
-            </div>
-            <p class="flex items-center text-xs text-slate-400">
-              范围: {{ CAPTURE_LENGTH_MIN.toLocaleString() }} - {{ CAPTURE_LENGTH_MAX.toLocaleString() }}
-            </p>
-          </div>
-          <div class="flex flex-col gap-2">
-            <label class="block text-sm font-semibold antialiased">
-              预捕获深度
-            </label>
-            <div class="relative w-[200px]">
-              <button 
-                @click="decreasePreCaptureLength"
-                class="absolute right-9 top-1 rounded-md border border-transparent p-1.5 text-center text-sm transition-all hover:bg-slate-100 focus:bg-slate-100 active:bg-slate-100 disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none" 
-                type="button"
-                :disabled="preCaptureLength <= PRE_CAPTURE_LENGTH_MIN"
-              >
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4">
-                  <path d="M3.75 7.25a.75.75 0 0 0 0 1.5h8.5a.75.75 0 0 0 0-1.5h-8.5Z" />
-                </svg>
-              </button>
-              <input 
-                v-model.number="preCaptureLength"
-                @change="handlePreCaptureLengthChange"
-                type="number" 
-                :min="PRE_CAPTURE_LENGTH_MIN"
-                :max="Math.max(0, captureLength - 1)"
-                class="w-full bg-transparent placeholder:text-sm border border-slate-200 rounded-md pl-3 pr-20 py-2 transition duration-300 ease focus:outline-none focus:border-slate-400 ring ring-transparent hover:ring-slate-800/10 focus:ring-slate-800/10 hover:border-slate-800 shadow-sm focus:shadow appearance-none [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none" 
-                :placeholder="PRE_CAPTURE_LENGTH_MIN.toString()"
-              />
-              <button 
-                @click="increasePreCaptureLength"
-                class="absolute right-1 top-1 rounded-md border border-transparent p-1.5 text-center text-sm transition-all hover:bg-slate-100 focus:bg-slate-100 active:bg-slate-100 disabled:pointer-events-none disabled:opacity-50 disabled:shadow-none" 
-                type="button"
-                :disabled="preCaptureLength >= Math.max(0, captureLength - 1)"
-              >
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" class="w-4 h-4">
-                  <path d="M8.75 3.75a.75.75 0 0 0-1.5 0v3.5h-3.5a.75.75 0 0 0 0 1.5h3.5v3.5a.75.75 0 0 0 1.5 0v-3.5h3.5a.75.75 0 0 0 0-1.5h-3.5v-3.5Z" />
-                </svg>
-              </button>
-            </div>
-            <p class="flex items-center text-xs text-slate-400">
-              范围: {{ PRE_CAPTURE_LENGTH_MIN }} - {{ Math.max(0, captureLength - 1) }}
-            </p>
-          </div>
-          <div class="flex flex-col gap-2">
-            <label class="block text-sm font-semibold antialiased">
-              重置配置
-            </label>
-            <div class="relative w-[200px]">
-              <button 
-                @click="resetConfiguration"
-                class="w-10 h-10 bg-transparent text-red-600 text-sm border border-red-200 rounded-md py-2 px-2.5 transition duration-300 ease ring ring-transparent hover:ring-red-600/10 focus:ring-red-600/10 hover:border-red-600 shadow-sm focus:shadow flex items-center justify-center"
-                type="button"
-                title="重置配置"
-              >
-                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentColor" class="w-4 h-4">
-                  <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 4v5h.582m15.356 2A8.001 8.001 0 004.582 9m0 0H9m11 11v-5h-.581m0 0a8.003 8.003 0 01-15.357-2m15.357 2H15" />
-                </svg>
-              </button>
-            </div>
-            <p class="flex items-center text-xs text-slate-400">
-              恢复所有设置到默认值
-            </p>
-          </div>
         </div>
       </div>
       <!-- 通道列表 -->
       <div class="space-y-2">
-        <!-- 表头 -->
+        <!-- 表头 - 小屏幕单列时显示 -->
         <div
-          class="flex items-center gap-2 p-2 bg-base-300 rounded-lg text-sm font-medium"
+          class="flex items-center gap-2 p-2 bg-base-300 rounded-lg text-sm font-medium lg:hidden"
         >
           <span class="w-16">通道</span>
+          <span class="w-20">启用/触发</span>
           <span class="w-32">标签</span>
           <span class="w-16">颜色</span>
           <span class="w-32">触发操作</span>
           <span class="w-32">触发值</span>
         </div>
 
-        <!-- 通道配置网格 - 根据当前通道组动态显示 -->
+        <!-- 通道配置网格 -->
-        <div class="grid grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-4">
+        <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
+          <!-- 左列 (CH0-CH3) -->
+          <div class="space-y-2">
+            <!-- 左列表头 - 大屏幕时显示 -->
             <div
-            v-for="(channel, index) in channels.filter(ch => ch.enabled)"
+              class="hidden lg:flex items-center gap-2 p-2 bg-base-300 rounded-lg text-sm font-medium"
+            >
+              <span class="w-16">通道</span>
+              <span class="w-20">启用</span>
+              <span class="w-32">标签</span>
+              <span class="w-16">颜色</span>
+              <span class="w-32">触发操作</span>
+              <span class="w-32">触发值</span>
+            </div>
+
+            <!-- 左列通道 (0-3) -->
+            <div
+              v-for="(channel, index) in channels.slice(0, 4)"
               :key="index"
               class="flex items-center gap-2 p-3 bg-base-200 rounded-lg hover:bg-base-300 transition-colors"
             >
               <!-- 通道编号和颜色指示 -->
               <div class="flex items-center gap-2 w-16">
-              <span class="font-mono font-medium">CH{{ channels.indexOf(channel) }}</span>
+                <span class="font-mono font-medium">CH{{ index }}</span>
                 <div
                   class="w-3 h-3 rounded-full border-2 border-white shadow-sm"
                   :style="{ backgroundColor: channel.color }"
                 ></div>
               </div>
 
+              <!-- 通道启用开关（同时控制触发） -->
+              <div class="form-control w-20">
+                <input
+                  type="checkbox"
+                  v-model="channel.enabled"
+                  class="toggle toggle-sm toggle-primary"
+                />
+              </div>
+
               <!-- 通道标签 -->
               <div class="form-control w-32">
                 <input
                   type="text"
                   v-model="channel.label"
-                :placeholder="`通道 ${channels.indexOf(channel)}`"
+                  :placeholder="`通道 ${index}`"
                   class="input input-sm input-bordered w-full"
+                  :disabled="!channel.enabled"
                 />
               </div>
 
@@ -264,13 +136,15 @@
                   type="color"
                   v-model="channel.color"
                   class="w-8 h-8 rounded border-2 border-base-300 cursor-pointer"
+                  :disabled="!channel.enabled"
                 />
               </div>
 
               <!-- 触发操作符选择 -->
               <select
-              v-model="signalConfigs[channels.indexOf(channel)].operator"
+                v-model="signalConfigs[index].operator"
                 class="select select-sm select-bordered w-32"
+                :disabled="!channel.enabled"
               >
                 <option
                   v-for="op in operators"
@@ -283,8 +157,9 @@
 
               <!-- 触发信号值选择 -->
               <select
-              v-model="signalConfigs[channels.indexOf(channel)].value"
+                v-model="signalConfigs[index].value"
                 class="select select-sm select-bordered w-32"
+                :disabled="!channel.enabled"
               >
                 <option
                   v-for="val in signalValues"
@@ -297,10 +172,174 @@
             </div>
           </div>
 
-        <!-- 当没有启用通道时的提示 -->
+          <!-- 右列 (CH4-CH7) - 仅在大屏幕显示 -->
-        <div v-if="enabledChannelCount === 0" class="text-center py-8 text-base-content/60">
+          <div class="hidden lg:block space-y-2">
-          <p class="text-lg font-medium">未启用任何通道</p>
+            <!-- 右列表头 -->
-          <p class="text-sm">请选择通道组来配置逻辑分析仪</p>
+            <div
+              class="flex items-center gap-2 p-2 bg-base-300 rounded-lg text-sm font-medium"
+            >
+              <span class="w-16">通道</span>
+              <span class="w-20">启用/触发</span>
+              <span class="w-32">标签</span>
+              <span class="w-16">颜色</span>
+              <span class="w-32">触发操作</span>
+              <span class="w-32">触发值</span>
+            </div>
+
+            <!-- 右列通道 (4-7) -->
+            <div
+              v-for="(channel, index) in channels.slice(4, 8)"
+              :key="index + 4"
+              class="flex items-center gap-2 p-3 bg-base-200 rounded-lg hover:bg-base-300 transition-colors"
+            >
+              <!-- 通道编号和颜色指示 -->
+              <div class="flex items-center gap-2 w-16">
+                <span class="font-mono font-medium">CH{{ index + 4 }}</span>
+                <div
+                  class="w-3 h-3 rounded-full border-2 border-white shadow-sm"
+                  :style="{ backgroundColor: channel.color }"
+                ></div>
+              </div>
+
+              <!-- 通道启用开关（同时控制触发） -->
+              <div class="form-control w-20">
+                <input
+                  type="checkbox"
+                  v-model="channel.enabled"
+                  class="toggle toggle-sm toggle-primary"
+                />
+              </div>
+
+              <!-- 通道标签 -->
+              <div class="form-control w-32">
+                <input
+                  type="text"
+                  v-model="channel.label"
+                  :placeholder="`通道 ${index + 4}`"
+                  class="input input-sm input-bordered w-full"
+                  :disabled="!channel.enabled"
+                />
+              </div>
+
+              <!-- 颜色选择 -->
+              <div class="form-control w-16">
+                <input
+                  type="color"
+                  v-model="channel.color"
+                  class="w-8 h-8 rounded border-2 border-base-300 cursor-pointer"
+                  :disabled="!channel.enabled"
+                />
+              </div>
+
+              <!-- 触发操作符选择 -->
+              <select
+                v-model="signalConfigs[index + 4].operator"
+                class="select select-sm select-bordered w-32"
+                :disabled="!channel.enabled"
+              >
+                <option
+                  v-for="op in operators"
+                  :key="op.value"
+                  :value="op.value"
+                >
+                  {{ op.label }}
+                </option>
+              </select>
+
+              <!-- 触发信号值选择 -->
+              <select
+                v-model="signalConfigs[index + 4].value"
+                class="select select-sm select-bordered w-32"
+                :disabled="!channel.enabled"
+              >
+                <option
+                  v-for="val in signalValues"
+                  :key="val.value"
+                  :value="val.value"
+                >
+                  {{ val.label }}
+                </option>
+              </select>
+            </div>
+          </div>
+
+          <!-- 小屏幕时继续显示 CH4-CH7 -->
+          <div class="lg:hidden space-y-2">
+            <div
+              v-for="(channel, index) in channels.slice(4, 8)"
+              :key="index + 4"
+              class="flex items-center gap-2 p-3 bg-base-200 rounded-lg hover:bg-base-300 transition-colors"
+            >
+              <!-- 通道编号和颜色指示 -->
+              <div class="flex items-center gap-2 w-16">
+                <span class="font-mono font-medium">CH{{ index + 4 }}</span>
+                <div
+                  class="w-3 h-3 rounded-full border-2 border-white shadow-sm"
+                  :style="{ backgroundColor: channel.color }"
+                ></div>
+              </div>
+
+              <!-- 通道启用开关（同时控制触发） -->
+              <div class="form-control w-20">
+                <input
+                  type="checkbox"
+                  v-model="channel.enabled"
+                  class="toggle toggle-sm toggle-primary"
+                />
+              </div>
+
+              <!-- 通道标签 -->
+              <div class="form-control w-32">
+                <input
+                  type="text"
+                  v-model="channel.label"
+                  :placeholder="`通道 ${index + 4}`"
+                  class="input input-sm input-bordered w-full"
+                  :disabled="!channel.enabled"
+                />
+              </div>
+
+              <!-- 颜色选择 -->
+              <div class="form-control w-16">
+                <input
+                  type="color"
+                  v-model="channel.color"
+                  class="w-8 h-8 rounded border-2 border-base-300 cursor-pointer"
+                  :disabled="!channel.enabled"
+                />
+              </div>
+
+              <!-- 触发操作符选择 -->
+              <select
+                v-model="signalConfigs[index + 4].operator"
+                class="select select-sm select-bordered w-32"
+                :disabled="!channel.enabled"
+              >
+                <option
+                  v-for="op in operators"
+                  :key="op.value"
+                  :value="op.value"
+                >
+                  {{ op.label }}
+                </option>
+              </select>
+
+              <!-- 触发信号值选择 -->
+              <select
+                v-model="signalConfigs[index + 4].value"
+                class="select select-sm select-bordered w-32"
+                :disabled="!channel.enabled"
+              >
+                <option
+                  v-for="val in signalValues"
+                  :key="val.value"
+                  :value="val.value"
+                >
+                  {{ val.label }}
+                </option>
+              </select>
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -308,16 +347,11 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, onMounted, onUnmounted } from "vue";
 import { useRequiredInjection } from "@/utils/Common";
 import { useLogicAnalyzerState } from "./LogicAnalyzerManager";
 
 const {
   currentGlobalMode,
-  currentChannelDiv,
-  currentclockDiv,
-  captureLength,
-  preCaptureLength,
   isApplying,
   channels,
   signalConfigs,
@@ -325,154 +359,18 @@ const {
   globalModes,
   operators,
   signalValues,
-  channelDivOptions,
+  enableAllChannels,
-  ClockDivOptions,
+  disableAllChannels,
-  CAPTURE_LENGTH_MIN,
-  CAPTURE_LENGTH_MAX,
-  PRE_CAPTURE_LENGTH_MIN,
-  validateCaptureLength,
-  validatePreCaptureLength,
-  setCaptureLength,
-  setPreCaptureLength,
-  setChannelDiv,
   setGlobalMode,
-  setClockDiv,
+  applyConfiguration,
   resetConfiguration,
 } = useRequiredInjection(useLogicAnalyzerState);
 
-// 下拉菜单状态
+const toggleAllChannels = () => {
-const showGlobalModeDropdown = ref(false);
+  if (enabledChannelCount.value > 0) {
-const showChannelDivDropdown = ref(false);
+    disableAllChannels();
-const showClockDivDropdown = ref(false);
+  } else {
-
+    enableAllChannels();
-// 处理捕获深度变化
-const handleCaptureLengthChange = () => {
-  setCaptureLength(captureLength.value);
-};
-
-// 处理预捕获深度变化
-const handlePreCaptureLengthChange = () => {
-  setPreCaptureLength(preCaptureLength.value);
-};
-
-// 增加捕获深度
-const increaseCaptureLength = () => {
-  const newValue = Math.min(captureLength.value + 1024, CAPTURE_LENGTH_MAX);
-  setCaptureLength(newValue);
-};
-
-// 减少捕获深度
-const decreaseCaptureLength = () => {
-  const newValue = Math.max(captureLength.value - 1024, CAPTURE_LENGTH_MIN);
-  setCaptureLength(newValue);
-};
-
-// 增加预捕获深度
-const increasePreCaptureLength = () => {
-  const maxValue = Math.max(0, captureLength.value - 1);
-  const newValue = Math.min(preCaptureLength.value + 64, maxValue);
-  setPreCaptureLength(newValue);
-};
-
-// 减少预捕获深度
-const decreasePreCaptureLength = () => {
-  const newValue = Math.max(preCaptureLength.value - 64, PRE_CAPTURE_LENGTH_MIN);
-  setPreCaptureLength(newValue);
-};
-
-// 计算属性：获取当前全局模式的标签
-const currentGlobalModeLabel = computed(() => {
-  const mode = globalModes.find(m => m.value === currentGlobalMode.value);
-  return mode ? mode.label : '';
-});
-
-// 计算属性：获取当前全局模式的描述
-const currentGlobalModeDescription = computed(() => {
-  const mode = globalModes.find(m => m.value === currentGlobalMode.value);
-  return mode ? mode.description : '';
-});
-
-// 计算属性：获取当前通道组的标签
-const currentChannelDivLabel = computed(() => {
-  const option = channelDivOptions.find(opt => opt.value === currentChannelDiv.value);
-  return option ? option.label : '';
-});
-
-// 计算属性：获取当前通道组的描述
-const currentChannelDivDescription = computed(() => {
-  const option = channelDivOptions.find(opt => opt.value === currentChannelDiv.value);
-  return option ? option.description : '';
-});
-
-// 计算属性：获取当前采样频率的标签
-const currentClockDivLabel = computed(() => {
-  const option = ClockDivOptions.find(opt => opt.value === currentclockDiv.value);
-  return option ? option.label : '';
-});
-
-// 计算属性：获取当前采样频率的描述
-const currentClockDivDescription = computed(() => {
-  const option = ClockDivOptions.find(opt => opt.value === currentclockDiv.value);
-  return option ? option.description : '';
-});
-
-// 全局模式下拉菜单相关函数
-const toggleGlobalModeDropdown = () => {
-  showGlobalModeDropdown.value = !showGlobalModeDropdown.value;
-  if (showGlobalModeDropdown.value) {
-    showChannelDivDropdown.value = false;
-    showClockDivDropdown.value = false;
   }
 };
-
-const selectGlobalMode = (mode: any) => {
-  setGlobalMode(mode);
-  showGlobalModeDropdown.value = false;
-};
-
-// 通道组下拉菜单相关函数
-const toggleChannelDivDropdown = () => {
-  showChannelDivDropdown.value = !showChannelDivDropdown.value;
-  if (showChannelDivDropdown.value) {
-    showGlobalModeDropdown.value = false;
-    showClockDivDropdown.value = false;
-  }
-};
-
-const selectChannelDiv = (value: number) => {
-  setChannelDiv(value);
-  showChannelDivDropdown.value = false;
-};
-
-// 采样频率下拉菜单相关函数
-const toggleClockDivDropdown = () => {
-  showClockDivDropdown.value = !showClockDivDropdown.value;
-  if (showClockDivDropdown.value) {
-    showGlobalModeDropdown.value = false;
-    showChannelDivDropdown.value = false;
-  }
-};
-
-const selectClockDiv = (value: any) => {
-  setClockDiv(value);
-  showClockDivDropdown.value = false;
-};
-
-// 点击其他地方关闭下拉菜单
-const handleClickOutside = (event: MouseEvent) => {
-  const target = event.target as HTMLElement;
-  if (!target.closest('.relative')) {
-    showGlobalModeDropdown.value = false;
-    showChannelDivDropdown.value = false;
-    showClockDivDropdown.value = false;
-  }
-};
-
-onMounted(() => {
-  document.addEventListener('click', handleClickOutside);
-});
-
-onUnmounted(() => {
-  document.removeEventListener('click', handleClickOutside);
-});
 </script>

src/components/MarkdownRenderer.vue

@@ -6,7 +6,6 @@ import hljs from 'highlight.js';
 import 'highlight.js/styles/github.css'; // 亮色主题
 // 导入主题存储
 import { useThemeStore } from '@/stores/theme';
-import { AuthManager } from '@/utils/AuthManager';
 
 const props = defineProps({
     content: {
@@ -16,10 +15,6 @@ const props = defineProps({
     removeFirstH1: {
         type: Boolean,
         default: false
-    },
-    examId: {
-        type: String,
-        default: ''
     }
 });
 
@@ -28,42 +23,6 @@ const themeStore = useThemeStore();
 // 使用 isDarkTheme 函数来检查当前是否为暗色主题
 const isDarkMode = computed(() => themeStore.isDarkTheme());
 
-// 图片资源缓存
-const imageResourceCache = ref<Map<string, string>>(new Map());
-
-// 获取图片资源ID的函数
-async function getImageResourceId(examId: string, imagePath: string): Promise<string | null> {
-  try {
-    const client = AuthManager.createAuthenticatedResourceClient();
-    const resources = await client.getResourceList(examId, 'images', 'template');
-    
-    // 查找匹配的图片资源
-    const imageResource = resources.find(r => r.name === imagePath || r.name.endsWith(imagePath));
-    
-    return imageResource ? imageResource.id.toString() : null;
-  } catch (error) {
-    console.error('获取图片资源ID失败:', error);
-    return null;
-  }
-}
-
-// 通过资源ID获取图片数据URL
-async function getImageDataUrl(resourceId: string): Promise<string | null> {
-  try {
-    const client = AuthManager.createAuthenticatedResourceClient();
-    const response = await client.getResourceById(parseInt(resourceId));
-    
-    if (response && response.data) {
-      return URL.createObjectURL(response.data);
-    }
-    
-    return null;
-  } catch (error) {
-    console.error('获取图片数据失败:', error);
-    return null;
-  }
-}
-
 // 监听主题变化
 watch(() => themeStore.currentTheme, () => {
     // 主题变化时更新代码高亮样式
@@ -95,27 +54,6 @@ const renderedContent = computed(() => {
     // 创建自定义渲染器
     const renderer = new marked.Renderer();
     
-    // 重写图片渲染方法，处理相对路径
-    renderer.image = (href, title, text) => {
-        let src = href;
-        
-        console.log(`原始图片路径: ${href}, examId: ${props.examId}`);
-        
-        // 如果是相对路径且有实验ID，需要通过动态API获取
-        if (props.examId && href && href.startsWith('./')) {
-            // 对于相对路径的图片，我们需要先获取图片资源ID，然后通过动态API获取
-            // 暂时保留原始路径，在后处理中进行替换
-            src = href;
-            console.log(`保留原始路径用于后处理: ${src}`);
-        }
-        
-        const titleAttr = title ? ` title="${title}"` : '';
-        const altAttr = text ? ` alt="${text}"` : '';
-        const dataOriginal = href && href.startsWith('./') ? ` data-original-src="${href}"` : '';
-        console.log(`最终渲染的HTML: <img src="${src}"${titleAttr}${altAttr}${dataOriginal} />`);
-        return `<img src="${src}"${titleAttr}${altAttr}${dataOriginal} />`;
-    };
-    
     // 重写代码块渲染方法，添加语言信息
     renderer.code = (code, incomingLanguage) => {
         // 确保语言参数是字符串
@@ -129,60 +67,14 @@ const renderedContent = computed(() => {
         return `<pre class="hljs" data-language="${validLanguage}"><code class="language-${validLanguage}">${highlightedCode}</code></pre>`;
     };
     
-    // 设置 marked 选项并解析内容
+    // 设置 marked 选项
-    let html = marked.parse(processedContent, {
+    marked.use({
         renderer: renderer,
         gfm: true,
         breaks: true
-    }) as string;
-    
-    // 后处理HTML，异步处理图片
-    if (props.examId) {
-        // 查找所有需要处理的图片
-        const imgMatches = Array.from(html.matchAll(/(<img[^>]+data-original-src=["'])\.\/([^"']+)(["'][^>]*>)/g));
-        
-        // 异步处理每个图片
-        imgMatches.forEach(async (match) => {
-            const [fullMatch, prefix, path, suffix] = match;
-            const imagePath = path.replace('images/', '');
-            
-            // 检查缓存
-            if (imageResourceCache.value.has(imagePath)) {
-                const cachedUrl = imageResourceCache.value.get(imagePath)!;
-                html = html.replace(fullMatch, `${prefix}${cachedUrl}${suffix.replace(' data-original-src="./'+path+'"', '')}`);
-                return;
-            }
-            
-            try {
-                // 获取图片资源ID
-                const resourceId = await getImageResourceId(props.examId, imagePath);
-                if (resourceId) {
-                    // 获取图片数据URL
-                    const dataUrl = await getImageDataUrl(resourceId);
-                    if (dataUrl) {
-                        // 缓存URL
-                        imageResourceCache.value.set(imagePath, dataUrl);
-                        
-                        // 更新HTML中的图片src
-                        const updatedHtml = html.replace(fullMatch, `${prefix}${dataUrl}${suffix.replace(' data-original-src="./'+path+'"', '')}`);
-                        
-                        // 触发重新渲染
-                        setTimeout(() => {
-                            const imgElements = document.querySelectorAll(`img[data-original-src="./${path}"]`);
-                            imgElements.forEach(img => {
-                                (img as HTMLImageElement).src = dataUrl;
-                                img.removeAttribute('data-original-src');
     });
-                        }, 0);
-                    }
-                }
-            } catch (error) {
-                console.error(`处理图片 ${imagePath} 失败:`, error);
-            }
-        });
-    }
     
-    return html;
+    return marked(processedContent);
 });
 
 // 页面挂载后，确保应用正确的主题样式

src/components/Navbar.vue

@@ -31,12 +31,6 @@
               工程界面
             </router-link>
           </li>
-          <li class="my-1 hover:translate-x-1 transition-all duration-300">
-            <router-link to="/exam" class="text-base font-medium">
-              <FileText class="icon" />
-              实验列表
-            </router-link>
-          </li>
           <li class="my-1 hover:translate-x-1 transition-all duration-300">
             <router-link to="/test" class="text-base font-medium">
               <FlaskConical class="icon" />

src/components/PopButton.vue

@@ -0,0 +1,11 @@
+<template>
+  <button class="btn transition-transform duration-150 ease-in-out hover:scale-120">
+    Button A
+  </button>
+</template>
+
+<script lang="ts" setup></script>
+
+<style scoped lang="postcss">
+@import "@/assets/main.css";
+</style>

src/components/Sidebar.vue

@@ -0,0 +1,162 @@
+<template>
+  <div
+    class="card card-dash shadow-xl h-screen"
+    :class="[sidebar.isClose ? 'w-31' : 'w-80']"
+  >
+    <div
+      class="card-body flex relative transition-all duration-500 ease-in-out"
+    >
+      <!-- Avatar and Name -->
+      <div class="relative" :class="sidebar.isClose ? 'h-50' : 'h-20'">
+        <!-- Img -->
+        <div
+          class="avatar h-10 fixed top-10"
+          :class="sidebar.isClose ? 'left-10' : 'left-7'"
+        >
+          <div class="rounded-full">
+            <img src="../assets/user.svg" alt="User" />
+          </div>
+        </div>
+        <!-- Text -->
+        <Transition>
+          <div v-if="!sidebar.isClose" class="mx-5 grow fixed left-20 top-11">
+            <label class="text-2xl">用户名</label>
+          </div>
+        </Transition>
+      </div>
+
+      <!-- Toggle Button -->
+      <button
+        class="btn btn-square rounded-lg p-2 m-3 fixed"
+        :class="sidebar.isClose ? 'left-7 top-23' : 'left-60 top-7'"
+        @click="sidebar.toggleSidebar"
+      >
+        <svg
+          t="1741694970690"
+          :class="sidebar.isClose ? 'rotate-0' : 'rotate-540'"
+          class="icon"
+          viewBox="0 0 1024 1024"
+          version="1.1"
+          xmlns="http://www.w3.org/2000/svg"
+          p-id="4546"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          width="200"
+          height="200"
+        >
+          <path
+            d="M803.758 514.017c-0.001-0.311-0.013-0.622-0.018-0.933-0.162-23.974-9.386-47.811-27.743-65.903-0.084-0.082-0.172-0.157-0.256-0.239-0.154-0.154-0.296-0.315-0.451-0.468L417.861 94.096c-37.685-37.153-99.034-37.476-136.331-0.718-37.297 36.758-36.979 97.231 0.707 134.384l290.361 286.257-290.362 286.257c-37.685 37.153-38.004 97.625-0.707 134.383 37.297 36.758 98.646 36.435 136.331-0.718l357.43-352.378c0.155-0.153 0.297-0.314 0.451-0.468 0.084-0.082 0.172-0.157 0.256-0.239 18.354-18.089 27.578-41.922 27.743-65.892 0.004-0.315 0.017-0.631 0.018-0.947z"
+            :fill="theme.isLightTheme() ? '#828282' : '#C0C3C8'"
+            p-id="4547"
+          ></path>
+        </svg>
+      </button>
+
+      <div class="divider"></div>
+
+      <ul class="menu h-full w-full">
+        <li v-for="item in props.items" class="text-xl my-1">
+          <a @click="router.push(item.page)">
+            <svg
+              t="1741694797806"
+              class="icon h-[1.5em] w-[1.5em] opacity-50 mx-1"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="2622"
+              xmlns:xlink="http://www.w3.org/1999/xlink"
+              width="200"
+              height="200"
+            >
+              <path
+                d="M192 192m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z"
+                p-id="2623"
+              ></path>
+              <path
+                d="M192 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z"
+                p-id="2624"
+              ></path>
+              <path
+                d="M192 832m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0Z"
+                p-id="2625"
+              ></path>
+              <path
+                d="M864 160H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 480H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 800H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32z"
+                p-id="2626"
+              ></path>
+            </svg>
+            <Transition>
+              <p class="break-keep" v-if="!sidebar.isClose">{{ item.text }}</p>
+            </Transition>
+          </a>
+        </li>
+      </ul>
+
+      <div class="divider"></div>
+
+      <ul class="menu w-full">
+        <li>
+          <a @click="theme.toggleTheme" class="text-xl">
+            <ThemeControlButton />
+            <Transition>
+              <p v-if="!sidebar.isClose" class="break-keep">改变主题</p>
+            </Transition>
+            <Transition>
+              <ThemeControlToggle v-if="!sidebar.isClose" />
+            </Transition>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import iconMenu from "../assets/menu.svg";
+import "../router";
+import { useThemeStore } from "@/stores/theme";
+import { useSidebarStore } from "@/stores/sidebar";
+import ThemeControlButton from "./ThemeControlButton.vue";
+import ThemeControlToggle from "./ThemeControlToggle.vue";
+import router from "../router";
+
+const theme = useThemeStore();
+const sidebar = useSidebarStore();
+
+type Item = {
+  id: number;
+  icon: string;
+  text: string;
+  page: string;
+};
+
+interface Props {
+  items?: Array<Item>;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  items: () => [
+    { id: 1, icon: iconMenu, text: "btn1", page: "/" },
+    { id: 2, icon: iconMenu, text: "btn2", page: "/" },
+    { id: 3, icon: iconMenu, text: "btn3", page: "/" },
+    { id: 4, icon: iconMenu, text: "btn4", page: "/" },
+  ],
+});
+</script>
+
+<style scoped lang="postcss">
+@reference "../assets/main.css";
+
+* {
+  @apply transition-all duration-500 ease-in-out;
+}
+
+.v-enter-active,
+.v-leave-active {
+  transition: opacity 0.3s ease;
+}
+
+.v-enter-from,
+.v-leave-to {
+  opacity: 0;
+}
+</style>

src/components/TutorialCarousel.vue

@@ -31,20 +31,8 @@
           
           <!-- 标题覆盖层 -->
           <div class="absolute bottom-0 left-0 right-0 p-4 bg-gradient-to-t from-base-300 to-transparent">
-            <div class="flex flex-col gap-2">
             <h3 class="text-lg font-bold text-base-content">{{ tutorial.title }}</h3>
             <p class="text-sm opacity-80 truncate">{{ tutorial.description }}</p>
-              <!-- 标签显示 -->
-              <div v-if="tutorial.tags && tutorial.tags.length > 0" class="flex flex-wrap gap-1">
-                <span 
-                  v-for="tag in tutorial.tags.slice(0, 3)" 
-                  :key="tag" 
-                  class="badge badge-outline badge-xs text-xs"
-                >
-                  {{ tag }}
-                </span>
-              </div>
-            </div>
           </div>
         </div>
       </div>
@@ -66,8 +54,6 @@
 <script setup lang="ts">
 import { ref, onMounted, onUnmounted } from 'vue';
 import { useRouter } from 'vue-router';
-import { AuthManager } from '@/utils/AuthManager';
-import type { ExamSummary } from '@/APIClient';
 
 // 接口定义
 interface Tutorial {
@@ -75,7 +61,7 @@ interface Tutorial {
   title: string;
   description: string;
   thumbnail?: string;
-  tags: string[];
+  docPath: string;
 }
 
 // Props
@@ -95,93 +81,87 @@ let autoRotationTimer: number | null = null;
 // 处理卡片点击
 const handleCardClick = (index: number, tutorialId: string) => {
   if (index === currentIndex.value) {
-    goToExam(tutorialId);
+    goToTutorial(tutorialId);
   } else {
     setActiveCard(index);
   }
 };
 
-// 从数据库加载实验数据
+// 从 public/doc 目录加载例程信息
 onMounted(async () => {
   try {
-    console.log('正在从数据库加载实验数据...');
+    // 尝试从API获取教程目录
-    
+    let tutorialIds: string[] = [];
-    // 创建认证客户端
-    const client = AuthManager.createAuthenticatedExamClient();
-    
-    // 获取实验列表
-    const examList: ExamSummary[] = await client.getExamList();
-    
-    // 筛选可见的实验并转换为Tutorial格式
-    const visibleExams = examList
-      .filter(exam => exam.isVisibleToUsers)
-      .slice(0, 6); // 限制轮播显示最多6个实验
-    
-    if (visibleExams.length === 0) {
-      console.warn('没有找到可见的实验');
-      return;
-    }
-    
-    // 转换数据格式并获取封面图片
-    const tutorialPromises = visibleExams.map(async (exam) => {
-      let thumbnail: string | undefined;
-      
     try {
-        // 获取实验的封面资源（模板资源）
+      const response = await fetch('/api/tutorial');
-        const resourceClient = AuthManager.createAuthenticatedResourceClient();
+      if (response.ok) {
-        const resourceList = await resourceClient.getResourceList(exam.id, 'cover', 'template');
+        const data = await response.json();
-        if (resourceList && resourceList.length > 0) {
+        tutorialIds = data.tutorials || [];
-          // 使用第一个封面资源
-          const coverResource = resourceList[0];
-          const fileResponse = await resourceClient.getResourceById(coverResource.id);
-          // 创建Blob URL作为缩略图
-          thumbnail = URL.createObjectURL(fileResponse.data);
       }
     } catch (error) {
-        console.warn(`无法获取实验${exam.id}的封面图片:`, error);
+      console.warn('无法从API获取教程目录，使用默认值:', error);
+    }
+    
+    // 如果API调用失败或返回空列表，使用默认值
+    if (tutorialIds.length === 0) {
+      console.log('使用默认教程列表');
+      tutorialIds = ['01', '02', '03', '04', '05', '06', '11', '12', '13']; // 默认例程
+    } else {
+      console.log('使用API获取的教程列表:', tutorialIds);
+    }
+    
+    // 为每个例程创建对象并尝试获取文档标题
+    const tutorialPromises = tutorialIds.map(async (id) => {
+      // 尝试读取doc.md获取标题
+      let title = `例程 ${id}`;
+      let description = "点击加载此例程";
+      let thumbnail = `/doc/${id}/cover.png`; // 默认使用第一张图片作为缩略图
+      
+      try {
+        // 尝试读取文档内容获取标题
+        const response = await fetch(`/doc/${id}/doc.md`);
+        if (response.ok) {
+          const text = await response.text();
+          // 从Markdown提取标题
+          const titleMatch = text.match(/^#\s+(.+)$/m);
+          if (titleMatch && titleMatch[1]) {
+            title = titleMatch[1].trim();
+          }
+          
+          // 提取第一段作为描述
+          const descMatch = text.match(/\n\n([^#\n][^\n]+)/);
+          if (descMatch && descMatch[1]) {
+            description = descMatch[1].substring(0, 100).trim();
+            if (description.length === 100) description += '...';
+          }
+        }
+      } catch (error) {
+        console.warn(`无法读取例程${id}的文档内容:`, error);
       }
       
       return {
-        id: exam.id,
+        id,
-        title: exam.name,
+        title,
-        description: '点击查看实验详情',
+        description,
         thumbnail,
-        tags: exam.tags || []
+        docPath: `/doc/${id}/doc.md`
       };
     });
     
     tutorials.value = await Promise.all(tutorialPromises);
     
-    console.log('成功加载实验数据:', tutorials.value.length, '个实验');
-    
     // 启动自动旋转
     startAutoRotation();
   } catch (error) {
-    console.error('加载实验数据失败:', error);
+    console.error('加载例程失败:', error);
-    
-    // 如果加载失败，显示默认的占位内容
-    tutorials.value = [{
-      id: 'placeholder',
-      title: '实验数据加载中...',
-      description: '请稍后或刷新页面重试',
-      thumbnail: undefined,
-      tags: []
-    }];
   }
 });
 
-// 在组件销毁时清除计时器和Blob URLs
+// 在组件销毁时清除计时器
 onUnmounted(() => {
   if (autoRotationTimer) {
     clearInterval(autoRotationTimer);
   }
-  
-  // 清理创建的Blob URLs
-  tutorials.value.forEach(tutorial => {
-    if (tutorial.thumbnail && tutorial.thumbnail.startsWith('blob:')) {
-      URL.revokeObjectURL(tutorial.thumbnail);
-    }
-  });
 });
 
 // 鼠标滚轮处理
@@ -230,12 +210,12 @@ const resumeAutoRotation = () => {
   }
 };
 
-// 前往实验
+// 前往例程
-const goToExam = (examId: string) => {
+const goToTutorial = (tutorialId: string) => {
-  // 跳转到实验列表页面并传递examId参数，页面将自动打开对应的实验详情模态框
+  // 跳转到工程页面，并通过 query 参数传递文档路径
   router.push({
-    path: '/exam',
+    path: '/project',
-    query: { examId: examId }
+    query: { tutorial: tutorialId }
   });
 };
 

src/components/UploadCard.vue

@@ -1,77 +1,25 @@
 <template>
-  <div class="flex flex-col bg-base-100 justify-center items-center gap-4">
+  <div class="flex flex-col bg-base-100 justify-center items-center">
     <!-- Title -->
-    <h1 class="font-bold text-2xl">比特流文件</h1>
+    <h1 class="font-bold text-2xl">上传比特流文件</h1>
-
-    <!-- 示例比特流下载区域 (仅在有examId时显示) -->
-    <div v-if="examId && availableBitstreams.length > 0" class="w-full">
-      <fieldset class="fieldset w-full">
-        <legend class="fieldset-legend text-sm">示例比特流文件</legend>
-        <div class="space-y-2">
-          <div
-            v-for="bitstream in availableBitstreams"
-            :key="bitstream.id"
-            class="flex items-center justify-between p-2 border-2 border-base-300 rounded-lg"
-          >
-            <span class="text-sm">{{ bitstream.name }}</span>
-            <div class="flex gap-2">
-              <button
-                @click="downloadExampleBitstream(bitstream)"
-                class="btn btn-sm btn-secondary"
-                :disabled="isDownloading || isProgramming"
-              >
-                <div v-if="isDownloading">
-                  <span class="loading loading-spinner loading-xs"></span>
-                  {{ downloadProgress }}%
-                </div>
-                <div v-else>下载示例</div>
-              </button>
-              <button
-                @click="programExampleBitstream(bitstream)"
-                class="btn btn-sm btn-primary"
-                :disabled="isDownloading || isProgramming"
-              >
-                <div v-if="isProgramming">
-                  <span class="loading loading-spinner loading-xs"></span>
-                  烧录中...
-                </div>
-                <div v-else>直接烧录</div>
-              </button>
-            </div>
-          </div>
-        </div>
-      </fieldset>
-    </div>
-
-    <!-- 分割线 -->
-    <div v-if="examId && availableBitstreams.length > 0" class="divider">
-      或
-    </div>
 
     <!-- Input File -->
     <fieldset class="fieldset w-full">
-      <legend class="fieldset-legend text-sm">上传自定义比特流文件</legend>
+      <legend class="fieldset-legend text-sm">选择或拖拽上传文件</legend>
-      <input
+      <input type="file" ref="fileInput" class="file-input w-full" @change="handleFileChange" />
-        type="file"
-        ref="fileInput"
-        class="file-input w-full"
-        @change="handleFileChange"
-      />
       <label class="fieldset-label">文件最大容量: {{ maxMemory }}MB</label>
     </fieldset>
 
     <!-- Upload Button -->
     <div class="card-actions w-full">
-      <button
+      <button @click="handleClick" class="btn btn-primary grow" :disabled="isUploading">
-        @click="handleClick"
-        class="btn btn-primary grow"
-        :disabled="isUploading || isProgramming"
-      >
         <div v-if="isUploading">
           <span class="loading loading-spinner"></span>
-          上传中...
+          下载中...
+        </div>
+        <div v-else>
+          {{ buttonText }}
         </div>
-        <div v-else>上传并下载</div>
       </button>
     </div>
   </div>
@@ -79,71 +27,28 @@
 
 <script lang="ts" setup>
 import { computed, ref, useTemplateRef, onMounted } from "vue";
-import { AuthManager } from "@/utils/AuthManager"; // Adjust the path based on your project structure
 import { useDialogStore } from "@/stores/dialog";
 import { isNull, isUndefined } from "lodash";
-import { useEquipments } from "@/stores/equipments";
-import type { HubConnection } from "@microsoft/signalr";
-import type {
-  IProgressHub,
-  IProgressReceiver,
-} from "@/TypedSignalR.Client/server.Hubs";
-import { getHubProxyFactory, getReceiverRegister } from "@/TypedSignalR.Client";
-import { ProgressStatus } from "@/server.Hubs";
-import { useRequiredInjection } from "@/utils/Common";
-import { useAlertStore } from "./Alert";
 
 interface Props {
+  uploadEvent?: (file: File) => Promise<boolean>;
+  downloadEvent?: () => Promise<boolean>;
   maxMemory?: number;
-  examId?: string; // 新增examId属性
 }
 
 const props = withDefaults(defineProps<Props>(), {
   maxMemory: 4,
-  examId: "",
 });
 
 const emits = defineEmits<{
   finishedUpload: [file: File];
 }>();
 
-const alert = useRequiredInjection(useAlertStore);
 const dialog = useDialogStore();
-const eqps = useEquipments();
 
 const isUploading = ref(false);
-const isDownloading = ref(false);
+const buttonText = computed(() => {
-const isProgramming = ref(false);
+  return isUndefined(props.downloadEvent) ? "上传" : "上传并下载";
-const availableBitstreams = ref<{ id: number; name: string }[]>([]);
-
-// Progress
-const downloadTaskId = ref("");
-const downloadProgress = ref(0);
-const progressHubConnection = ref<HubConnection>();
-const progressHubProxy = ref<IProgressHub>();
-const progressHubReceiver: IProgressReceiver = {
-  onReceiveProgress: async (msg) => {
-    if (msg.taskId == downloadTaskId.value) {
-      if (msg.status == ProgressStatus.InProgress) {
-        downloadProgress.value = msg.progressPercent;
-      } else if (msg.status == ProgressStatus.Failed) {
-        dialog.error(msg.errorMessage);
-      } else if (msg.status == ProgressStatus.Completed) {
-        alert.info("比特流下载成功");
-      }
-    }
-  },
-};
-onMounted(async () => {
-  progressHubConnection.value =
-    AuthManager.createAuthenticatedProgressHubConnection();
-  progressHubProxy.value = getHubProxyFactory("IProgressHub").createHubProxy(
-    progressHubConnection.value,
-  );
-  getReceiverRegister("IProgressReceiver").register(
-    progressHubConnection.value,
-    progressHubReceiver,
-  );
 });
 
 const fileInput = useTemplateRef("fileInput");
@@ -151,97 +56,14 @@ const bitstream = defineModel("bitstreamFile", {
   type: File,
   default: undefined,
 });
-
+onMounted(() => {
-// 初始化时加载示例比特流
-onMounted(async () => {
   if (!isUndefined(bitstream.value) && !isNull(fileInput.value)) {
     let fileList = new DataTransfer();
     fileList.items.add(bitstream.value);
     fileInput.value.files = fileList.files;
   }
-
-  await loadAvailableBitstreams();
 });
 
-// 加载可用的比特流文件列表
-async function loadAvailableBitstreams() {
-  console.log("加载可用比特流文件，examId:", props.examId);
-  if (!props.examId) {
-    availableBitstreams.value = [];
-    return;
-  }
-
-  try {
-    const resourceClient = AuthManager.createAuthenticatedResourceClient();
-    // 使用新的ResourceClient API获取比特流模板资源列表
-    const resources = await resourceClient.getResourceList(
-      props.examId,
-      "bitstream",
-      "template",
-    );
-    availableBitstreams.value =
-      resources.map((r) => ({ id: r.id, name: r.name })) || [];
-  } catch (error) {
-    console.error("加载比特流列表失败:", error);
-    availableBitstreams.value = [];
-  }
-}
-
-// 下载示例比特流
-async function downloadExampleBitstream(bitstream: {
-  id: number;
-  name: string;
-}) {
-  if (isDownloading.value) return;
-
-  isDownloading.value = true;
-  try {
-    const resourceClient = AuthManager.createAuthenticatedResourceClient();
-
-    // 使用新的ResourceClient API获取资源文件
-    const response = await resourceClient.getResourceById(bitstream.id);
-
-    if (response && response.data) {
-      // 创建下载链接
-      const url = URL.createObjectURL(response.data);
-      const link = document.createElement("a");
-      link.href = url;
-      link.download = response.fileName || bitstream.name;
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-      URL.revokeObjectURL(url);
-
-      dialog.info("示例比特流下载成功");
-    } else {
-      dialog.error("下载失败：响应数据为空");
-    }
-  } catch (error) {
-    console.error("下载示例比特流失败:", error);
-    dialog.error("下载示例比特流失败");
-  } finally {
-    isDownloading.value = false;
-  }
-}
-
-// 直接烧录示例比特流
-async function programExampleBitstream(bitstream: {
-  id: number;
-  name: string;
-}) {
-  if (isProgramming.value) return;
-
-  isProgramming.value = true;
-  try {
-    const downloadTaskId = await eqps.jtagDownloadBitstream(bitstream.id);
-  } catch (error) {
-    console.error("烧录示例比特流失败:", error);
-    dialog.error("烧录示例比特流失败");
-  } finally {
-    isProgramming.value = false;
-  }
-}
-
 function handleFileChange(event: Event): void {
   const target = event.target as HTMLInputElement;
   const file = target.files?.[0]; // 获取选中的第一个文件
@@ -263,49 +85,48 @@ function checkFile(file: File): boolean {
 }
 
 async function handleClick(event: Event): Promise<void> {
-  console.log("上传按钮被点击");
   if (isNull(bitstream.value) || isUndefined(bitstream.value)) {
     dialog.error(`未选择文件`);
     return;
   }
 
   if (!checkFile(bitstream.value)) return;
+  if (isUndefined(props.uploadEvent)) {
+    dialog.error("无法上传");
+    return;
+  }
 
   isUploading.value = true;
-  let uploadedBitstreamId: number | null = null;
   try {
-    console.log("开始上传比特流文件:", bitstream.value.name);
+    const ret = await props.uploadEvent(bitstream.value);
-    const bitstreamId = await eqps.jtagUploadBitstream(
+    if (isUndefined(props.downloadEvent)) {
-      bitstream.value,
+      if (ret) {
-      props.examId || "",
+        dialog.info("上传成功");
-    );
+        emits("finishedUpload", bitstream.value);
-    console.log("上传结果，ID:", bitstreamId);
+      } else dialog.error("上传失败");
-    if (bitstreamId === null || bitstreamId === undefined) {
+      return;
+    }
+    if (!ret) {
       isUploading.value = false;
       return;
     }
-    uploadedBitstreamId = bitstreamId;
   } catch (e) {
     dialog.error("上传失败");
     console.error(e);
     return;
   }
-  isUploading.value = false;
 
   // Download
   try {
-    console.log("开始下载比特流，ID:", uploadedBitstreamId);
+    const ret = await props.downloadEvent();
-    if (uploadedBitstreamId === null || uploadedBitstreamId === undefined) {
+    if (ret) dialog.info("下载成功");
-      dialog.error("uploadedBitstreamId is null or undefined");
+    else dialog.error("下载失败");
-    } else {
-      isDownloading.value = true;
-      downloadTaskId.value =
-        await eqps.jtagDownloadBitstream(uploadedBitstreamId);
-    }
   } catch (e) {
     dialog.error("下载失败");
     console.error(e);
   }
+
+  isUploading.value = false;
 }
 </script>
 

src/components/WaveformDisplay/WaveformDisplay.vue

@@ -2,12 +2,12 @@
   <div
     class="w-full"
     :class="{
-      'h-48': !props.data,
+      'h-48': !analyzer.logicData.value,
-      'h-150': props.data,
+      'h-150': analyzer.logicData.value,
     }"
   >
     <v-chart
-      v-if="props.data"
+      v-if="analyzer.logicData.value"
       class="w-full h-full"
       :option="option"
       autoresize
@@ -17,20 +17,17 @@
       v-else
       class="w-full h-full flex flex-col gap-6 items-center justify-center"
     >
-      <template v-if="hasSlot">
-        <slot />
-      </template>
-      <template v-else>
       <div class="text-center">
-          <h3 class="text-xl font-semibold text-slate-600 mb-2">暂无数据</h3>
+        <h3 class="text-xl font-semibold text-slate-600 mb-2">
+          暂无逻辑分析数据
+        </h3>
       </div>
-      </template>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed, shallowRef, useSlots } from "vue";
+import { computed, shallowRef } from "vue";
 import VChart from "vue-echarts";
 
 // Echarts
@@ -42,7 +39,6 @@ import {
   DataZoomComponent,
   AxisPointerComponent,
   ToolboxComponent,
-  MarkLineComponent,
 } from "echarts/components";
 import { CanvasRenderer } from "echarts/renderers";
 import type { ComposeOption } from "echarts/core";
@@ -52,15 +48,15 @@ import type {
   TooltipComponentOption,
   GridComponentOption,
   DataZoomComponentOption,
-  MarkLineComponentOption,
 } from "echarts/components";
 import type {
   ToolboxComponentOption,
   XAXisOption,
   YAXisOption,
 } from "echarts/types/dist/shared";
+import { useRequiredInjection } from "@/utils/Common";
 import { isUndefined } from "lodash";
-import type { LogicDataType } from ".";
+import { useWaveformManager } from "./WaveformManager";
 
 use([
   TooltipComponent,
@@ -70,7 +66,6 @@ use([
   DataZoomComponent,
   LineChart,
   CanvasRenderer,
-  MarkLineComponent,
 ]);
 
 type EChartsOption = ComposeOption<
@@ -80,15 +75,9 @@ type EChartsOption = ComposeOption<
   | GridComponentOption
   | DataZoomComponentOption
   | LineSeriesOption
-  | MarkLineComponentOption
 >;
 
-const props = defineProps<{
+const analyzer = useRequiredInjection(useWaveformManager);
-  data?: LogicDataType;
-}>();
-
-const slots = useSlots();
-const hasSlot = computed(() => !!slots.default && slots.default().length > 0);
 
 // 添加更新选项来减少重绘
 const updateOptions = shallowRef({
@@ -98,13 +87,11 @@ const updateOptions = shallowRef({
 });
 
 const option = computed((): EChartsOption => {
-  if (isUndefined(props.data)) return {};
+  if (isUndefined(analyzer.logicData.value)) return {};
 
   // 只获取启用的通道，使用y数据结构
-  const enabledChannels = props.data.y.filter(
+  const enabledChannels = analyzer.logicData.value.y.filter(channel => channel.enabled);
-    (channel) => channel.enabled,
+  const enabledChannelIndices = analyzer.logicData.value.y
-  );
-  const enabledChannelIndices = props.data.y
     .map((channel, index) => (channel.enabled ? index : -1))
     .filter((index) => index !== -1);
 
@@ -130,12 +117,12 @@ const option = computed((): EChartsOption => {
   const xAxis: XAXisOption[] = [
     {
       type: "category",
-      boundaryGap: true,
+      boundaryGap: false,
-      data: props.data.x.map((x) => x.toFixed(3)),
+      data: analyzer.logicData.value.x.map((x) => x.toFixed(3)),
       axisLabel: {
         formatter: (value: string) =>
-          props.data
+          analyzer.logicData.value
-            ? `${value}${props.data.xUnit}`
+            ? `${value}${analyzer.logicData.value.xUnit}`
             : `${value}`,
       },
     },
@@ -162,9 +149,8 @@ const option = computed((): EChartsOption => {
 
   // 创建系列数据
   const series: LineSeriesOption[] = [];
-  enabledChannelIndices.forEach(
+  enabledChannelIndices.forEach((originalIndex: number, displayIndex: number) => {
-    (originalIndex: number, displayIndex: number) => {
+    const channel = analyzer.logicData.value!.y[originalIndex];
-      const channel = props.data!.y[originalIndex];
     if (channel.type === "logic") {
       // logic类型，原样显示
       series.push({
@@ -188,126 +174,52 @@ const option = computed((): EChartsOption => {
         animation: false,
       });
     } else if (channel.type === "number") {
+      // number类型，VCD仿真样式：两个线条（1和0），变化时有斜率（过渡点），无areaStyle
       const values = channel.value;
-        const xArr = props.data!.x;
+      const xArr = analyzer.logicData.value!.x;
       // 构造带过渡的点序列
       function buildVcdLine(valArr: number[], high: number, low: number) {
-          const points: { x: number; y: number }[] = [];
+        const points: {x: number, y: number}[] = [];
         let lastValue = high;
         points.push({x: xArr[0], y: lastValue});
         for (let i = 1; i < valArr.length; i++) {
-            const v =
+          const v = valArr[i] !== valArr[i-1] ? (lastValue === high ? low : high) : lastValue;
-              valArr[i] !== valArr[i - 1]
-                ? lastValue === high
-                  ? low
-                  : high
-                : lastValue;
           points.push({x: xArr[i], y: v});
           lastValue = v;
         }
-          return points.map((p) => p.y);
+        // 返回y数组，x由category轴控制
+        return points.map(p => p.y);
       }
-
-        // 计算变化点区间
-        function buildMarkLines(valArr: number[], yBase: number) {
-          const markLines: any[] = [];
-          let lastValue = valArr[0];
-          let lastIdx = 0;
-          // 格式化函数
-          function formatValue(val: number) {
-            if (channel.base === "hex")
-              return "0x" + val.toString(16).toUpperCase();
-            if (channel.base === "bin") return "0b" + val.toString(2);
-            return val.toString();
-          }
-          for (let i = 1; i <= valArr.length; i++) {
-            if (i === valArr.length || valArr[i] !== lastValue) {
-              markLines.push([
-                {
-                  xAxis: lastIdx,
-                  yAxis: yBase,
-                  label: {
-                    formatter: formatValue(lastValue),
-                    position: "insideMiddle",
-                    color: channel.color,
-                    fontSize: 18,
-                    opacity: 1,
-                  },
-                  lineStyle: {
-                    opacity: 0,
-                  },
-                },
-                {
-                  xAxis: i - 1,
-                  yAxis: yBase,
-                  lineStyle: {
-                    opacity: 0,
-                  },
-                },
-              ]);
-              lastValue = valArr[i];
-              lastIdx = i;
-            }
-          }
-          return markLines;
-        }
-
       // 1线条
       series.push({
         name: channel.name + "_1",
         type: "line",
-          data: buildVcdLine(
+        data: buildVcdLine(values, displayIndex * channelSpacing + 1, displayIndex * channelSpacing),
-            values,
+        step: false, // 关闭step，允许斜率
-            displayIndex * channelSpacing + 1,
-            displayIndex * channelSpacing,
-          ),
-          step: false,
         lineStyle: {
           width: 2,
           color: channel.color,
         },
-          areaStyle: {
-            opacity: 0.3,
-            origin: displayIndex * channelSpacing + 0.5,
-            color: channel.color,
-          },
         symbol: "none",
         sampling: "lttb",
         animation: false,
-          // 添加markLine
-          markLine: {
-            data: buildMarkLines(values, displayIndex * channelSpacing + 0.5),
-            emphasis: {
-              disabled: true,
-            },
-          },
       });
       // 0线条
       series.push({
         name: channel.name + "_0",
         type: "line",
-          data: buildVcdLine(
+        data: buildVcdLine(values, displayIndex * channelSpacing, displayIndex * channelSpacing + 1),
-            values,
-            displayIndex * channelSpacing,
-            displayIndex * channelSpacing + 1,
-          ),
         step: false,
         lineStyle: {
           width: 2,
           color: channel.color,
         },
-          areaStyle: {
-            opacity: 0.3,
-            origin: displayIndex * channelSpacing + 0.5,
-            color: channel.color,
-          },
         symbol: "none",
         sampling: "lttb",
         animation: false,
       });
     }
-    },
+  });
-  );
 
   return {
     animation: false,
@@ -322,12 +234,11 @@ const option = computed((): EChartsOption => {
       },
       formatter: (params: any) => {
         if (Array.isArray(params) && params.length > 0) {
-          const timeValue = props.data!.x[params[0].dataIndex];
+          const timeValue = analyzer.logicData.value!.x[params[0].dataIndex];
           const dataIndex = params[0].dataIndex;
-          let tooltip = `Time: ${timeValue.toFixed(3)}${props.data!.xUnit}<br/>`;
+          let tooltip = `Time: ${timeValue.toFixed(3)}${analyzer.logicData.value!.xUnit}<br/>`;
-          enabledChannelIndices.forEach(
+          enabledChannelIndices.forEach((originalIndex: number, displayIndex: number) => {
-            (originalIndex: number, displayIndex: number) => {
+            const channel = analyzer.logicData.value!.y[originalIndex];
-              const channel = props.data!.y[originalIndex];
             if (channel.type === "logic") {
               const channelName = channel.name;
               const originalValue = channel.value[dataIndex];
@@ -337,8 +248,7 @@ const option = computed((): EChartsOption => {
               const originalValue = channel.value[dataIndex];
               tooltip += `${channelName}: ${originalValue}<br/>`;
             }
-            },
+          });
-          );
           return tooltip;
         }
         return "";

src/components/WaveformDisplay/WaveformManager.ts

@@ -0,0 +1,73 @@
+import { createInjectionState } from "@vueuse/core";
+import { shallowRef } from "vue";
+
+export type LogicDataType = {
+  x: number[];
+  y: {
+    enabled: boolean;
+    type: "logic" | "number";
+    name: string;
+    color: string;
+    value: number[];
+    base: "bin" | "dec" | "hex";
+  }[];
+  xUnit: "s" | "ms" | "us" | "ns";
+};
+
+// 生成4路测试数据的函数
+export function generateTestData(): LogicDataType {
+  // 生成时间轴数据 (0-100ns，每1ns一个采样点)
+  const timePoints = Array.from({ length: 101 }, (_, i) => i);
+
+  return {
+    x: timePoints,
+    y: [
+      {
+        enabled: true,
+        type: "logic",
+        name: "CLK",
+        color: "#ff0000",
+        value: timePoints.map((t) => t % 2), // 时钟信号，每1ns翻转
+        base: "bin",
+      },
+      {
+        enabled: true,
+        type: "logic",
+        name: "RESET",
+        color: "#00ff00",
+        value: timePoints.map((t) => (t < 10 ? 1 : 0)), // 复位信号，前10ns为高电平
+        base: "bin",
+      },
+      {
+        enabled: true,
+        type: "number",
+        name: "DATA",
+        color: "#0000ff",
+        value: timePoints.map((t) => Math.floor(t / 4) % 16), // 计数器，每4ns递增
+        base: "hex",
+      },
+      {
+        enabled: true,
+        type: "logic",
+        name: "ENABLE",
+        color: "#ff8800",
+        value: timePoints.map((t) => (t >= 20 && t < 80 ? 1 : 0)), // 使能信号，20-80ns为高电平
+        base: "bin",
+      },
+    ],
+    xUnit: "ns",
+  };
+}
+
+const [useProvideWaveformManager, useWaveformManager] = createInjectionState(
+  () => {
+    const logicData = shallowRef<LogicDataType>();
+
+    return {
+      logicData,
+      generateTestData,
+    };
+  },
+);
+
+export { useProvideWaveformManager, useWaveformManager };

src/components/WaveformDisplay/index.ts

@@ -1,61 +1,5 @@
 import WaveformDisplay from "./WaveformDisplay.vue";
 
-export type LogicDataType = {
+export {
-  x: number[];
+  WaveformDisplay
-  y: {
-    enabled: boolean;
-    type: "logic" | "number";
-    name: string;
-    color: string;
-    value: number[];
-    base: "bin" | "dec" | "hex";
-  }[];
-  xUnit: "s" | "ms" | "us" | "ns";
 };
-
-// 生成4路测试数据的函数
-export function generateTestData(): LogicDataType {
-  // 生成时间轴数据 (0-100ns，每1ns一个采样点)
-  const timePoints = Array.from({ length: 101 }, (_, i) => i);
-
-  return {
-    x: timePoints,
-    y: [
-      {
-        enabled: true,
-        type: "logic",
-        name: "CLK",
-        color: "#ff0000",
-        value: timePoints.map((t) => t % 2), // 时钟信号，每1ns翻转
-        base: "bin",
-      },
-      {
-        enabled: true,
-        type: "logic",
-        name: "RESET",
-        color: "#00ff00",
-        value: timePoints.map((t) => (t < 10 ? 1 : 0)), // 复位信号，前10ns为高电平
-        base: "bin",
-      },
-      {
-        enabled: true,
-        type: "number",
-        name: "DATA",
-        color: "#0000ff",
-        value: timePoints.map((t) => Math.floor(t / 4) % 16), // 计数器，每4ns递增
-        base: "hex",
-      },
-      {
-        enabled: true,
-        type: "logic",
-        name: "ENABLE",
-        color: "#ff8800",
-        value: timePoints.map((t) => (t >= 20 && t < 80 ? 1 : 0)), // 使能信号，20-80ns为高电平
-        base: "bin",
-      },
-    ],
-    xUnit: "ns",
-  };
-}
-
-export { WaveformDisplay };

src/components/equipments/MotherBoard.vue

@@ -27,7 +27,7 @@
     to="#ComponentCapabilities"
     v-if="selectecComponentID === props.componentId"
   >
-    <MotherBoardCaps :jtagFreq="jtagFreq" :exam-id="examId" @change-jtag-freq="changeJtagFreq" />
+    <MotherBoardCaps :jtagFreq="jtagFreq" @change-jtag-freq="changeJtagFreq" />
   </Teleport>
 </template>
 
@@ -41,7 +41,6 @@ import { toNumber } from "lodash";
 export interface MotherBoardProps {
   size: number;
   componentId?: string;
-  examId?: string; // 新增examId属性
 }
 
 const emit = defineEmits<{

src/components/equipments/MotherBoardCaps.vue

@@ -8,34 +8,20 @@
         <p>
           IDCode: 0x{{ jtagIDCode.toString(16).padStart(8, "0").toUpperCase() }}
         </p>
-        <button
+        <button class="btn btn-circle w-6 h-6" :disabled="isGettingIDCode" :onclick="getIDCode">
-          class="btn btn-circle w-6 h-6"
+          <RefreshCcwIcon class="icon" :class="{ 'animate-spin': isGettingIDCode }" />
-          :disabled="isGettingIDCode"
-          :onclick="getIDCode"
-        >
-          <RefreshCcwIcon
-            class="icon"
-            :class="{ 'animate-spin': isGettingIDCode }"
-          />
         </button>
       </div>
     </div>
     <div class="divider"></div>
-    <UploadCard
+    <UploadCard class="bg-base-200" :upload-event="eqps.jtagUploadBitstream"
-      :exam-id="props.examId"
+      :download-event="eqps.jtagDownloadBitstream" :bitstream-file="eqps.jtagBitstream"
-      :upload-event="eqps.jtagUploadBitstream"
+      @update:bitstream-file="handleBitstreamChange">
-      :bitstream-file="eqps.jtagBitstream"
-      @update:bitstream-file="handleBitstreamChange"
-    >
     </UploadCard>
     <div class="divider"></div>
     <div class="w-full">
       <legend class="fieldset-legend text-sm mb-0.3">Jtag运行频率</legend>
-      <select
+      <select class="select w-full" @change="handleSelectJtagSpeed" :value="props.jtagFreq">
-        class="select w-full"
-        @change="handleSelectJtagSpeed"
-        :value="props.jtagFreq"
-      >
         <option v-for="option in selectJtagSpeedOptions" :value="option.id">
           {{ option.text }}
         </option>
@@ -44,38 +30,27 @@
     <div class="flex flex-row items-center">
       <fieldset class="fieldset w-70">
         <legend class="fieldset-legend text-sm">边界扫描刷新率 / Hz</legend>
-        <input
+        <input type="number" class="input validator" required placeholder="Type a number between 1 to 1000" min="1"
-          type="number"
+          max="1000" v-model="jtagBoundaryScanFreq" title="Type a number between 1 to 1000" />
-          class="input validator"
-          required
-          placeholder="Type a number between 1 to 1000"
-          min="1"
-          max="1000"
-          v-model="jtagBoundaryScanFreq"
-          title="Type a number between 1 to 1000"
-        />
         <p class="validator-hint">输入一个1 ~ 1000的数</p>
       </fieldset>
-      <button
+      <button class="btn btn-primary grow mx-4" :class="eqps.enableJtagBoundaryScan ? '' : 'btn-soft'"
-        class="btn btn-primary grow mx-4"
+        :onclick="toggleJtagBoundaryScan">
-        :class="eqps.enableJtagBoundaryScan ? '' : 'btn-soft'"
-        :onclick="toggleJtagBoundaryScan"
-      >
         {{ eqps.enableJtagBoundaryScan ? "关闭边界扫描" : "启动边界扫描" }}
       </button>
     </div>
     <div class="divider"></div>
     <h1 class="font-bold text-center text-2xl">外设</h1>
-    <div class="flex flex-row justify-center">
+    <div class="flex flex-row justify-around">
       <div class="flex flex-row">
-        <input
+        <input type="checkbox" class="checkbox" :checked="eqps.enableMatrixKey"
-          type="checkbox"
+          @change="handleMatrixkeyCheckboxChange" />
-          class="checkbox"
-          :checked="eqps.enableMatrixKey"
-          @change="handleMatrixkeyCheckboxChange"
-        />
         <p class="mx-2">启用矩阵键盘</p>
       </div>
+      <div class="flex flex-row">
+        <input type="checkbox" class="checkbox" :checked="eqps.enablePower" @change="handlePowerCheckboxChange" />
+        <p class="mx-2">启用电源</p>
+      </div>
     </div>
   </div>
 </template>
@@ -90,7 +65,6 @@ import { RefreshCcwIcon } from "lucide-vue-next";
 
 interface CapsProps {
   jtagFreq?: string;
-  examId?: string; // 新增examId属性
 }
 
 const emits = defineEmits<{
@@ -146,8 +120,18 @@ async function handleMatrixkeyCheckboxChange(event: Event) {
   }
 }
 
+async function handlePowerCheckboxChange(event: Event) {
+  const target = event.target as HTMLInputElement;
+  const ret = await eqps.powerSetOnOff(target.checked);
+  if (target.checked) {
+    eqps.enablePower = ret;
+  } else {
+    eqps.enablePower = !ret;
+  }
+}
+
 async function toggleJtagBoundaryScan() {
-  eqps.jtagBoundaryScanSetOnOff(!eqps.enableJtagBoundaryScan);
+  eqps.enableJtagBoundaryScan = !eqps.enableJtagBoundaryScan;
 }
 
 const isGettingIDCode = ref(false);

src/router/index.ts

@@ -4,7 +4,6 @@ import AuthView from "../views/AuthView.vue";
 import ProjectView from "../views/Project/Index.vue";
 import TestView from "../views/TestView.vue";
 import UserView from "@/views/User/Index.vue";
-import ExamView from "@/views/ExamView.vue";
 
 const router = createRouter({
   history: createWebHistory(import.meta.env.BASE_URL),
@@ -14,7 +13,6 @@ const router = createRouter({
     { path: "/project", name: "project", component: ProjectView },
     { path: "/test", name: "test", component: TestView },
     { path: "/user", name: "user", component: UserView },
-    { path: "/exam", name: "exam", component: ExamView },
   ],
 });
 

src/server.Hubs.ts

@@ -1,25 +0,0 @@
-/* THIS (.ts) FILE IS GENERATED BY Tapper */
-/* eslint-disable */
-/* tslint:disable */
-
-/** Transpiled from server.Hubs.ProgressStatus */
-export enum ProgressStatus {
-    Pending = 0,
-    InProgress = 1,
-    Completed = 2,
-    Canceled = 3,
-    Failed = 4,
-}
-
-/** Transpiled from server.Hubs.ProgressInfo */
-export type ProgressInfo = {
-    /** Transpiled from string */
-    taskId: string;
-    /** Transpiled from server.Hubs.ProgressStatus */
-    status: ProgressStatus;
-    /** Transpiled from int */
-    progressPercent: number;
-    /** Transpiled from string */
-    errorMessage: string;
-}
-

src/stores/constraints.ts

@@ -1,25 +1,26 @@
-import { ref, computed, reactive } from "vue";
+import { ref, computed, reactive } from 'vue'
-import { defineStore } from "pinia";
+import { defineStore } from 'pinia'
-import { isBoolean } from "lodash";
+import { isBoolean } from 'lodash';
 
 // 约束电平状态类型
-export type ConstraintLevel = "high" | "low" | "undefined";
+export type ConstraintLevel = 'high' | 'low' | 'undefined';
+
+export const useConstraintsStore = defineStore('constraints', () => {
 
-export const useConstraintsStore = defineStore("constraints", () => {
   // 约束状态存储
   const constraintStates = reactive<Record<string, ConstraintLevel>>({});
 
   // 约束颜色映射
   const constraintColors = {
-    high: "#ff3333", // 高电平为红色
+    high: '#ff3333', // 高电平为红色
-    low: "#3333ff", // 低电平为蓝色
+    low: '#3333ff',  // 低电平为蓝色
-    undefined: "#999999", // 未定义为灰色
+    undefined: '#999999' // 未定义为灰色
   };
 
   // 获取约束状态
   function getConstraintState(constraint: string): ConstraintLevel {
-    if (!constraint) return "undefined";
+    if (!constraint) return 'undefined';
-    return constraintStates[constraint] || "undefined";
+    return constraintStates[constraint] || 'undefined';
   }
 
   // 设置约束状态
@@ -29,9 +30,7 @@ export const useConstraintsStore = defineStore("constraints", () => {
   }
 
   // 批量设置约束状态
-  function batchSetConstraintStates(
+  function batchSetConstraintStates(states: Record<string, ConstraintLevel> | Record<string, boolean>) {
-    states: Record<string, ConstraintLevel> | Partial<Record<string, boolean>>,
-  ) {
     // 收集发生变化的约束
     const changedConstraints: [string, ConstraintLevel][] = [];
 
@@ -39,8 +38,6 @@ export const useConstraintsStore = defineStore("constraints", () => {
     Object.entries(states).forEach(([constraint, level]) => {
       if (isBoolean(level)) {
         level = level ? "high" : "low";
-      } else {
-        level = "low";
       }
 
       if (constraintStates[constraint] !== level) {
@@ -51,7 +48,7 @@ export const useConstraintsStore = defineStore("constraints", () => {
 
     // 通知所有变化
     changedConstraints.forEach(([constraint, level]) => {
-      stateChangeCallbacks.forEach((callback) => callback(constraint, level));
+      stateChangeCallbacks.forEach(callback => callback(constraint, level));
     });
   }
 
@@ -63,7 +60,7 @@ export const useConstraintsStore = defineStore("constraints", () => {
 
   // 清除所有约束状态
   function clearAllConstraintStates() {
-    Object.keys(constraintStates).forEach((key) => {
+    Object.keys(constraintStates).forEach(key => {
       delete constraintStates[key];
     });
   }
@@ -74,14 +71,9 @@ export const useConstraintsStore = defineStore("constraints", () => {
   }
 
   // 注册约束状态变化回调
-  const stateChangeCallbacks: ((
+  const stateChangeCallbacks: ((constraint: string, level: ConstraintLevel) => void)[] = [];
-    constraint: string,
-    level: ConstraintLevel,
-  ) => void)[] = [];
 
-  function onConstraintStateChange(
+  function onConstraintStateChange(callback: (constraint: string, level: ConstraintLevel) => void) {
-    callback: (constraint: string, level: ConstraintLevel) => void,
-  ) {
     stateChangeCallbacks.push(callback);
     return () => {
       const index = stateChangeCallbacks.indexOf(callback);
@@ -94,7 +86,7 @@ export const useConstraintsStore = defineStore("constraints", () => {
   // 触发约束变化
   function notifyConstraintChange(constraint: string, level: ConstraintLevel) {
     setConstraintState(constraint, level);
-    stateChangeCallbacks.forEach((callback) => callback(constraint, level));
+    stateChangeCallbacks.forEach(callback => callback(constraint, level));
   }
 
   return {
@@ -106,5 +98,6 @@ export const useConstraintsStore = defineStore("constraints", () => {
     getAllConstraintStates,
     onConstraintStateChange,
     notifyConstraintChange,
-  };
+  }
-});
+})
+

src/stores/equipments.ts

@@ -1,18 +1,15 @@
-import { ref, reactive, watchPostEffect, onMounted, onUnmounted } from "vue";
+import { ref, reactive, watchPostEffect } from "vue";
 import { defineStore } from "pinia";
 import { useLocalStorage } from "@vueuse/core";
-import { isString, toNumber, isUndefined, type Dictionary } from "lodash";
+import { isString, toNumber } from "lodash";
 import z from "zod";
 import { isNumber } from "mathjs";
+import { JtagClient, MatrixKeyClient, PowerClient } from "@/APIClient";
 import { Mutex, withTimeout } from "async-mutex";
 import { useConstraintsStore } from "@/stores/constraints";
 import { useDialogStore } from "./dialog";
 import { toFileParameterOrUndefined } from "@/utils/Common";
 import { AuthManager } from "@/utils/AuthManager";
-import { HubConnection, HubConnectionBuilder } from "@microsoft/signalr";
-import { getHubProxyFactory, getReceiverRegister } from "@/TypedSignalR.Client";
-import type { ResourceInfo } from "@/APIClient";
-import type { IJtagHub } from "@/TypedSignalR.Client/server.Hubs";
 
 export const useEquipments = defineStore("equipments", () => {
   // Global Stores
@@ -25,39 +22,13 @@ export const useEquipments = defineStore("equipments", () => {
   // Jtag
   const jtagBitstream = ref<File>();
   const jtagBoundaryScanFreq = ref(100);
-  const jtagUserBitstreams = ref<ResourceInfo[]>([]);
+  const jtagBoundaryScanErrorCount = ref(0); // 边界扫描连续错误计数
+  const maxJtagBoundaryScanErrors = 5; // 最大允许连续错误次数
   const jtagClientMutex = withTimeout(
     new Mutex(),
     1000,
     new Error("JtagClient Mutex Timeout!"),
   );
-  const jtagHubConnection = ref<HubConnection>();
-  const jtagHubProxy = ref<IJtagHub>();
-
-  onMounted(async () => {
-    // 每次挂载都重新创建连接
-    jtagHubConnection.value =
-      AuthManager.createAuthenticatedJtagHubConnection();
-    jtagHubProxy.value = getHubProxyFactory("IJtagHub").createHubProxy(
-      jtagHubConnection.value,
-    );
-
-    getReceiverRegister("IJtagReceiver").register(jtagHubConnection.value, {
-      onReceiveBoundaryScanData: async (msg) => {
-        constrainsts.batchSetConstraintStates(msg);
-      },
-    });
-    await jtagHubConnection.value.start();
-  });
-
-  onUnmounted(() => {
-    // 断开连接，清理资源
-    if (jtagHubConnection.value) {
-      jtagHubConnection.value.stop();
-      jtagHubConnection.value = undefined;
-      jtagHubProxy.value = undefined;
-    }
-  });
 
   // Matrix Key
   const matrixKeyStates = reactive(new Array<boolean>(16).fill(false));
@@ -79,6 +50,41 @@ export const useEquipments = defineStore("equipments", () => {
   const enableMatrixKey = ref(false);
   const enablePower = ref(false);
 
+  // Watch
+  watchPostEffect(async () => {
+    if (true === enableJtagBoundaryScan.value) {
+      // 重新启用时重置错误计数器
+      jtagBoundaryScanErrorCount.value = 0;
+      jtagBoundaryScan();
+    }
+  });
+
+  // Parse and Set
+  function setAddr(address: string | undefined): boolean {
+    if (isString(address) && z.string().ip("4").safeParse(address).success) {
+      boardAddr.value = address;
+      return true;
+    }
+
+    return false;
+  }
+
+  function setPort(port: string | number | undefined): boolean {
+    if (isString(port) && port.length != 0) {
+      const portNumber = toNumber(port);
+      if (z.number().nonnegative().max(65535).safeParse(portNumber).success) {
+        boardPort.value = portNumber;
+        return true;
+      }
+    } else if (isNumber(port)) {
+      if (z.number().nonnegative().max(65535).safeParse(port).success) {
+        boardPort.value = port;
+        return true;
+      }
+    }
+    return false;
+  }
+
   function setMatrixKey(
     keyNum: number | string | undefined,
     keyValue: boolean,
@@ -99,81 +105,66 @@ export const useEquipments = defineStore("equipments", () => {
     return false;
   }
 
-  async function jtagBoundaryScanSetOnOff(enable: boolean) {
+  async function jtagBoundaryScan() {
-    if (isUndefined(jtagHubProxy.value)) {
+    const release = await jtagClientMutex.acquire();
-      console.error("JtagHub Not Initialize...");
-      return;
-    }
-
-    if (enable) {
-      const ret = await jtagHubProxy.value.startBoundaryScan(
-        jtagBoundaryScanFreq.value,
-      );
-      if (!ret) {
-        console.error("Failed to start boundary scan");
-        return;
-      }
-    } else {
-      const ret = await jtagHubProxy.value.stopBoundaryScan();
-      if (!ret) {
-        console.error("Failed to stop boundary scan");
-        return;
-      }
-    }
-    enableJtagBoundaryScan.value = enable;
-  }
-
-  async function jtagUploadBitstream(
-    bitstream: File,
-    examId?: string,
-  ): Promise<number | null> {
     try {
-      // 自动开启电源
+      const jtagClient = AuthManager.createAuthenticatedJtagClient();
-      await powerSetOnOff(true);
+      const portStates = await jtagClient.boundaryScanLogicalPorts(
+        boardAddr.value,
+        boardPort.value,
+      );
 
-      const resourceClient = AuthManager.createAuthenticatedResourceClient();
+      constrainsts.batchSetConstraintStates(portStates);
-      const resp = await resourceClient.addResource(
+      
-        "bitstream",
+      // 扫描成功，重置错误计数器
-        "user",
+      jtagBoundaryScanErrorCount.value = 0;
-        examId || null,
+    } catch (error) {
+      jtagBoundaryScanErrorCount.value++;
+      
+      console.error(`边界扫描错误 (${jtagBoundaryScanErrorCount.value}/${maxJtagBoundaryScanErrors}):`, error);
+      
+      // 如果错误次数超过最大允许次数，才停止扫描并显示错误
+      if (jtagBoundaryScanErrorCount.value >= maxJtagBoundaryScanErrors) {
+        dialog.error("边界扫描发生连续错误，已自动停止");
+        enableJtagBoundaryScan.value = false;
+        jtagBoundaryScanErrorCount.value = 0; // 重置错误计数器
+      }
+    } finally {
+      release();
+
+      if (enableJtagBoundaryScan.value)
+        setTimeout(jtagBoundaryScan, 1000 / jtagBoundaryScanFreq.value);
+    }
+  }
+
+  async function jtagUploadBitstream(bitstream: File): Promise<boolean> {
+    try {
+      const jtagClient = AuthManager.createAuthenticatedJtagClient();
+      const resp = await jtagClient.uploadBitstream(
+        boardAddr.value,
         toFileParameterOrUndefined(bitstream),
       );
-
+      return resp;
-      // 如果上传成功，设置为当前选中的比特流
-      if (resp && resp.id !== undefined && resp.id !== null) {
-        return resp.id;
-      }
-
-      return null;
     } catch (e) {
       dialog.error("上传错误");
       console.error(e);
-      return null;
+      return false;
     }
   }
 
-  async function jtagDownloadBitstream(bitstreamId?: number): Promise<string> {
+  async function jtagDownloadBitstream(): Promise<boolean> {
-    if (bitstreamId === null || bitstreamId === undefined) {
-      dialog.error("请先选择要下载的比特流");
-      return "";
-    }
-
     const release = await jtagClientMutex.acquire();
     try {
-      // 自动开启电源
-      await powerSetOnOff(true);
-
       const jtagClient = AuthManager.createAuthenticatedJtagClient();
       const resp = await jtagClient.downloadBitstream(
         boardAddr.value,
         boardPort.value,
-        bitstreamId,
       );
       return resp;
     } catch (e) {
-      dialog.error("下载错误");
+      dialog.error("上传错误");
       console.error(e);
-      throw e;
+      return false;
     } finally {
       release();
     }
@@ -182,9 +173,6 @@ export const useEquipments = defineStore("equipments", () => {
   async function jtagGetIDCode(isQuiet: boolean = false): Promise<number> {
     const release = await jtagClientMutex.acquire();
     try {
-      // 自动开启电源
-      await powerSetOnOff(true);
-
       const jtagClient = AuthManager.createAuthenticatedJtagClient();
       const resp = await jtagClient.getDeviceIDCode(
         boardAddr.value,
@@ -202,9 +190,6 @@ export const useEquipments = defineStore("equipments", () => {
   async function jtagSetSpeed(speed: number): Promise<boolean> {
     const release = await jtagClientMutex.acquire();
     try {
-      // 自动开启电源
-      await powerSetOnOff(true);
-
       const jtagClient = AuthManager.createAuthenticatedJtagClient();
       const resp = await jtagClient.setSpeed(
         boardAddr.value,
@@ -224,8 +209,7 @@ export const useEquipments = defineStore("equipments", () => {
     const release = await matrixKeypadClientMutex.acquire();
     console.log("set Key !!!!!!!!!!!!");
     try {
-      const matrixKeypadClient =
+      const matrixKeypadClient = AuthManager.createAuthenticatedMatrixKeyClient();
-        AuthManager.createAuthenticatedMatrixKeyClient();
       const resp = await matrixKeypadClient.setMatrixKeyStatus(
         boardAddr.value,
         boardPort.value,
@@ -244,8 +228,7 @@ export const useEquipments = defineStore("equipments", () => {
     const release = await matrixKeypadClientMutex.acquire();
     try {
       if (enable) {
-        const matrixKeypadClient =
+        const matrixKeypadClient = AuthManager.createAuthenticatedMatrixKeyClient();
-          AuthManager.createAuthenticatedMatrixKeyClient();
         const resp = await matrixKeypadClient.enabelMatrixKey(
           boardAddr.value,
           boardPort.value,
@@ -253,8 +236,7 @@ export const useEquipments = defineStore("equipments", () => {
         enableMatrixKey.value = resp;
         return resp;
       } else {
-        const matrixKeypadClient =
+        const matrixKeypadClient = AuthManager.createAuthenticatedMatrixKeyClient();
-          AuthManager.createAuthenticatedMatrixKeyClient();
         const resp = await matrixKeypadClient.disableMatrixKey(
           boardAddr.value,
           boardPort.value,
@@ -293,14 +275,16 @@ export const useEquipments = defineStore("equipments", () => {
   return {
     boardAddr,
     boardPort,
+    setAddr,
+    setPort,
     setMatrixKey,
 
     // Jtag
     enableJtagBoundaryScan,
-    jtagBoundaryScanSetOnOff,
     jtagBitstream,
     jtagBoundaryScanFreq,
-    jtagUserBitstreams,
+    jtagBoundaryScanErrorCount,
+    jtagClientMutex,
     jtagUploadBitstream,
     jtagDownloadBitstream,
     jtagGetIDCode,

src/stores/sidebar.ts

@@ -0,0 +1,29 @@
+import { ref, computed } from 'vue'
+import { defineStore } from 'pinia'
+
+export const useSidebarStore = defineStore('sidebar', () => {
+  const isClose = ref(false);
+
+  function closeSidebar() {
+    isClose.value = true;
+    console.info("Close sidebar");
+  }
+
+  function openSidebar() {
+    isClose.value = false;
+    console.info("Open sidebar");
+  }
+
+  function toggleSidebar() {
+    if (isClose.value) {
+      openSidebar();
+      // themeSidebar.value = "card-dash sidebar-base sidebar-open"
+    } else {
+      closeSidebar();
+      // themeSidebar.value = "card-dash sidebar-base sidebar-close"
+    }
+  }
+
+  return { isClose, closeSidebar, openSidebar, toggleSidebar }
+})
+

src/utils/AuthManager.ts

@@ -12,15 +12,7 @@ import {
   LogicAnalyzerClient,
   NetConfigClient,
   OscilloscopeApiClient,
-  DebuggerClient,
-  ExamClient,
-  ResourceClient,
-  HdmiVideoStreamClient,
 } from "@/APIClient";
-import router from "@/router";
-import { HubConnectionBuilder } from "@microsoft/signalr";
-import axios, { type AxiosInstance } from "axios";
-import { isNull } from "lodash";
 
 // 支持的客户端类型联合类型
 type SupportedClient =
@@ -36,11 +28,7 @@ type SupportedClient =
   | LogicAnalyzerClient
   | UDPClient
   | NetConfigClient
-  | OscilloscopeApiClient
+  | OscilloscopeApiClient;
-  | DebuggerClient
-  | ExamClient
-  | ResourceClient
-  | HdmiVideoStreamClient;
 
 export class AuthManager {
   // 存储token到localStorage
@@ -118,27 +106,13 @@ export class AuthManager {
     };
   }
 
-  // 私有方法：创建带认证的Axios实例
-  private static createAuthenticatedAxiosInstance(): AxiosInstance | null {
-    const token = AuthManager.getToken();
-    if (!token) return null;
-
-    const instance = axios.create();
-    instance.interceptors.request.use((config) => {
-      config.headers = config.headers || {};
-      (config.headers as any)["Authorization"] = `Bearer ${token}`;
-      return config;
-    });
-    return instance;
-  }
-
   // 通用的创建已认证客户端的方法（使用泛型）
   public static createAuthenticatedClient<T extends SupportedClient>(
-    ClientClass: new (baseUrl?: string, instance?: AxiosInstance) => T,
+    ClientClass: new (baseUrl?: string, http?: any) => T,
   ): T {
-    const axiosInstance = AuthManager.createAuthenticatedAxiosInstance();
+    const customHttp = AuthManager.createAuthenticatedHttp();
-    return axiosInstance
+    return customHttp
-      ? new ClientClass(undefined, axiosInstance)
+      ? new ClientClass(undefined, customHttp)
       : new ClientClass();
   }
 
@@ -195,52 +169,6 @@ export class AuthManager {
     return AuthManager.createAuthenticatedClient(OscilloscopeApiClient);
   }
 
-  public static createAuthenticatedDebuggerClient(): DebuggerClient {
-    return AuthManager.createAuthenticatedClient(DebuggerClient);
-  }
-
-  public static createAuthenticatedExamClient(): ExamClient {
-    return AuthManager.createAuthenticatedClient(ExamClient);
-  }
-
-  public static createAuthenticatedResourceClient(): ResourceClient {
-    return AuthManager.createAuthenticatedClient(ResourceClient);
-  }
-
-  public static createAuthenticatedHdmiVideoStreamClient(): HdmiVideoStreamClient {
-    return AuthManager.createAuthenticatedClient(HdmiVideoStreamClient);
-  }
-
-  public static createAuthenticatedJtagHubConnection() {
-    const token = this.getToken();
-    if (isNull(token)) {
-      router.push("/login");
-      throw Error("Token Null!");
-    }
-
-    return new HubConnectionBuilder()
-      .withUrl("http://127.0.0.1:5000/hubs/JtagHub", {
-        accessTokenFactory: () => token,
-      })
-      .withAutomaticReconnect()
-      .build();
-  }
-
-  public static createAuthenticatedProgressHubConnection() {
-    const token = this.getToken();
-    if (isNull(token)) {
-      router.push("/login");
-      throw Error("Token Null!");
-    }
-
-    return new HubConnectionBuilder()
-      .withUrl("http://127.0.0.1:5000/hubs/ProgressHub", {
-        accessTokenFactory: () => token,
-      })
-      .withAutomaticReconnect()
-      .build();
-  }
-
   // 登录函数
   public static async login(
     username: string,

src/views/HomeView.vue

@@ -25,37 +25,26 @@
           </h1>
 
           <p class="py-6 text-lg opacity-80 leading-relaxed">
-            在浏览器中进行FPGA原型设计和电路仿真，使用现代直观的界面。创建、测试和分享您的FPGA设计，体验从基础学习到高级项目的完整开发流程。
+            Prototype and simulate electronic circuits in your browser with our
+            modern, intuitive interface. Create, test, and share your FPGA
+            designs seamlessly.
           </p>
-          <div class="flex flex-col sm:flex-row gap-4 actions-container">
+          <div class="flex flex-wrap gap-4 actions-container">
             <router-link
               to="/project"
-              class="btn btn-primary text-base-100 shadow-lg transform transition-all duration-300 hover:scale-105 hover:shadow-xl hover:-translate-y-1 flex-1 sm:flex-none"
+              class="btn btn-primary text-base-100 shadow-lg transform transition-all duration-300 hover:scale-105 hover:shadow-xl hover:-translate-y-1"
             >
               <BookOpen class="h-5 w-5 mr-2" />
               进入工程界面
             </router-link>
-            <router-link
-              to="/exam"
-              class="btn btn-secondary text-base-100 shadow-lg transform transition-all duration-300 hover:scale-105 hover:shadow-xl hover:-translate-y-1 flex-1 sm:flex-none"
-            >
-              <GraduationCap class="h-5 w-5 mr-2" />
-              实验列表
-            </router-link>
           </div>
           <div
             class="mt-8 p-4 bg-base-300 rounded-lg shadow-inner opacity-80 transition-all duration-300 hover:opacity-100 hover:shadow-md"
           >
-            <div class="space-y-2">
             <p class="text-sm">
-                <span class="font-semibold text-primary">工程界面：</span>
+              <span class="font-semibold text-primary">提示：</span>
-                自由创建和编辑FPGA项目，使用可视化画布进行电路设计和仿真测试。
+              您可以在工程界面中创建、编辑和测试您的FPGA项目，使用我们简洁直观的界面轻松进行硬件设计。
             </p>
-              <p class="text-sm">
-                <span class="font-semibold text-secondary">实验列表：</span>
-                浏览结构化的学习实验，从基础概念到高级应用的系统性学习路径。
-              </p>
-            </div>
           </div>
         </div>
       </div>
@@ -66,7 +55,7 @@
 <script lang="ts" setup>
 import "@/router";
 import TutorialCarousel from "@/components/TutorialCarousel.vue";
-import { BookOpen, GraduationCap } from "lucide-vue-next";
+import { BookOpen } from "lucide-vue-next";
 </script>
 
 <style scoped lang="postcss">

src/views/Project/BottomBar.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="h-full flex flex-col gap-7">
-    <div class="tabs tabs-lift flex-shrink-0 mx-5">
+    <div class="tabs tabs-box flex-shrink-0 shadow-xl mx-5">
       <label class="tab">
         <input
           type="radio"
@@ -31,8 +31,8 @@
           :checked="checkID === 3"
           @change="handleTabChange"
         />
-        <Monitor class="icon" />
+        <SquareActivityIcon class="icon" />
-        HDMI视频流
+        示波器
       </label>
       <label class="tab">
         <input
@@ -42,17 +42,6 @@
           :checked="checkID === 4"
           @change="handleTabChange"
         />
-        <SquareActivityIcon class="icon" />
-        示波器
-      </label>
-      <label class="tab">
-        <input
-          type="radio"
-          name="function-bar"
-          id="5"
-          :checked="checkID === 5"
-          @change="handleTabChange"
-        />
         <Binary class="icon" />
         逻辑分析仪
       </label>
@@ -60,8 +49,8 @@
         <input
           type="radio"
           name="function-bar"
-          id="6"
+          id="5"
-          :checked="checkID === 6"
+          :checked="checkID === 5"
           @change="handleTabChange"
         />
         <Hand class="icon" />
@@ -84,15 +73,12 @@
         <VideoStreamView />
       </div>
       <div v-else-if="checkID === 3" class="h-full overflow-y-auto">
-        <HdmiVideoStreamView />
-      </div>
-      <div v-else-if="checkID === 4" class="h-full overflow-y-auto">
         <OscilloscopeView />
       </div>
-      <div v-else-if="checkID === 5" class="h-full overflow-y-auto">
+      <div v-else-if="checkID === 4" class="h-full overflow-y-auto">
         <LogicAnalyzerView />
       </div>
-      <div v-else-if="checkID === 6" class="h-full overflow-y-auto">
+      <div v-else-if="checkID === 5" class="h-full overflow-y-auto">
         <Debugger />
       </div>
     </div>
@@ -108,22 +94,24 @@ import {
   MinimizeIcon,
   Binary,
   Hand,
-  Monitor,
 } from "lucide-vue-next";
 import { useLocalStorage } from "@vueuse/core";
 import VideoStreamView from "@/views/Project/VideoStream.vue";
-import HdmiVideoStreamView from "@/views/Project/HdmiVideoStream.vue";
 import OscilloscopeView from "@/views/Project/Oscilloscope.vue";
 import LogicAnalyzerView from "@/views/Project/LogicAnalyzer.vue";
 import { isNull, toNumber } from "lodash";
 import { onMounted, ref, watch } from "vue";
 import Debugger from "./Debugger.vue";
 import { useProvideLogicAnalyzer } from "@/components/LogicAnalyzer";
+import { useProvideWaveformManager } from "@/components/WaveformDisplay/WaveformManager";
 import { useProvideOscilloscope } from "@/components/Oscilloscope/OscilloscopeManager";
 
 const analyzer = useProvideLogicAnalyzer();
+const waveformManager = useProvideWaveformManager();
 const oscilloscopeManager = useProvideOscilloscope();
 
+waveformManager.logicData.value = waveformManager.generateTestData();
+
 const checkID = useLocalStorage("checkID", 1);
 
 // 定义事件

src/views/Project/Debugger.vue

@@ -1,527 +1,11 @@
 <template>
   <div>
-    <div class="card m-5 bg-base-200 shadow-2xl">
+    <div class="card">
-      <div class="card-body">
+      <WaveformDisplay />
-        <h2 class="card-title flex justify-between items-center">
-          <div class="flex items-center gap-2">
-            <Zap class="w-5 h-5" />
-            调试器波形捕获
     </div>
-          <div class="flex items-center gap-2">
-            <button
-              class="btn btn-sm btn-primary"
-              @click="
-                () => {
-                  handleDeleteData();
-                  startCapture();
-                }
-              "
-              :disabled="!captureData"
-            >
-              重新捕获
-            </button>
-            <button
-              class="btn btn-sm btn-error"
-              @click="handleDeleteData"
-              :disabled="!captureData"
-            >
-              清空
-            </button>
-          </div>
-        </h2>
-        <WaveformDisplay :data="captureData">
-          <div class="text-center">
-            <h3 class="text-xl font-semibold text-slate-600 mb-2">
-              暂无逻辑分析数据
-            </h3>
-            <p class="text-sm text-slate-500">点击下方按钮开始捕获</p>
-          </div>
-          <button
-            class="group relative px-8 py-3 bg-gradient-to-r text-white font-medium rounded-lg shadow-lg hover:shadow-xl transform hover:scale-105 transition-all duration-200 ease-in-out focus:outline-none focus:ring-4 active:scale-95"
-            :class="{
-              'from-blue-500 to-purple-600 hover:from-blue-600 hover:to-purple-700 focus:ring-blue-300':
-                !isCapturing,
-              'from-red-500 to-red-600 hover:from-red-600 hover:to-red-700 focus:ring-red-300':
-                isCapturing,
-            }"
-            @click="isCapturing ? stopCapture() : startCapture()"
-          >
-            <span class="flex items-center gap-2">
-              <template v-if="isCapturing">
-                <Square class="w-5 h-5" />
-                停止捕获
-              </template>
-              <template v-else>
-                <Play class="w-5 h-5" />
-                开始捕获
-              </template>
-            </span>
-          </button>
-        </WaveformDisplay>
-      </div>
-    </div>
-    <!-- Debugger 通道配置 -->
-    <div class="card m-5 bg-base-200 shadow-2xl">
-      <div class="card-body">
-        <div class="flex justify-between">
-          <h2 class="card-title mb-4">调试器通道配置</h2>
-          <div class="flex items-center gap-2">
-            <button
-              class="btn btn-sm btn-primary"
-              @click="addChannel"
-              :disabled="!configInited"
-            >
-              添加通道
-            </button>
-            <button
-              class="btn btn-sm btn-secondary"
-              @click="showConfigDialog = true"
-            >
-              配置
-            </button>
-          </div>
-        </div>
-        <!-- 配置未初始化时 -->
-        <div
-          v-if="!configInited"
-          class="flex flex-col items-center justify-center py-10"
-        >
-          <div class="text-lg text-slate-500 mb-4">请先进行调试器基本配置</div>
-          <button class="btn btn-primary" @click="showConfigDialog = true">
-            配置调试器
-          </button>
-        </div>
-
-        <div v-if="configInited" class="overflow-x-auto flex flex-col gap-10">
-          <!-- 状态概览 -->
-          <div
-            class="stats stats-horizontal bg-base-100 shadow flex justify-between"
-          >
-            <div class="stat">
-              <div class="stat-title">启用端口数</div>
-              <div class="stat-value text-primary">
-                {{ config.totalPortNum }}
-              </div>
-              <div class="stat-desc">每端口最大32线</div>
-            </div>
-            <div class="stat">
-              <div class="stat-title">最大线宽数</div>
-              <div class="stat-value text-info">
-                {{ config.totalPortNum * 32 }}
-              </div>
-              <div class="stat-desc">启用端口数 × 32</div>
-            </div>
-            <div class="stat">
-              <div class="stat-title">已用线宽数</div>
-              <div class="stat-value text-success">
-                {{ channels.reduce((sum, ch) => sum + ch.width, 0) }}
-              </div>
-              <div class="stat-desc">所有通道线宽总和</div>
-            </div>
-            <div class="stat">
-              <div class="stat-title">采样深度</div>
-              <div class="stat-value text-warning">
-                {{ config.captureDepth }}
-              </div>
-              <div class="stat-desc">每通道采样点数</div>
-            </div>
-            <div class="stat">
-              <div class="stat-title">时钟频率</div>
-              <div class="stat-value text-accent">{{ config.clkFreq }} MHz</div>
-              <div class="stat-desc">采样时钟</div>
-            </div>
-          </div>
-
-          <!-- 通道表格 -->
-          <div class="space-y-2">
-            <!-- 表头 -->
-            <div
-              class="grid grid-cols-7 justify-items-center gap-2 p-2 bg-base-300 rounded-lg text-sm font-medium"
-            >
-              <span>名称</span>
-              <span>显示</span>
-              <span>颜色</span>
-              <span>触发模式</span>
-              <span>数据位宽(起始:结尾)</span>
-              <span>父端口编号</span>
-              <span>操作</span>
-            </div>
-            <!-- 通道列表 -->
-            <div
-              v-for="(ch, idx) in channels"
-              :key="idx"
-              class="grid grid-cols-7 place-items-center gap-4 p-4 bg-base-200 rounded-lg hover:bg-base-300 transition-colors"
-            >
-              <input
-                v-model="ch.name"
-                class="input input-bordered w-full"
-                :placeholder="`通道${idx + 1}`"
-              />
-              <input
-                type="checkbox"
-                v-model="ch.visible"
-                class="toggle toggle-primary"
-              />
-              <input
-                type="color"
-                v-model="ch.color"
-                class="w-8 h-8 rounded border-2 border-base-300 cursor-pointer"
-              />
-              <select
-                v-model="ch.trigger"
-                class="select select-bordered w-full"
-              >
-                <option
-                  v-for="mode in triggerModes"
-                  :key="mode.value"
-                  :value="mode.value"
-                >
-                  {{ mode.label }}
-                </option>
-              </select>
-              <input
-                v-model="ch.widthStr"
-                class="input input-bordered w-full"
-                placeholder="如0:7"
-                @change="parseWidthStr(idx)"
-              />
-              <input
-                type="number"
-                min="0"
-                :max="config.totalPortNum - 1"
-                v-model.number="ch.parentPort"
-                class="input input-bordered w-full"
-              />
-              <button class="btn btn-error" @click="removeChannel(idx)">
-                删除
-              </button>
-            </div>
-            <!-- 添加通道按钮 -->
-            <div class="flex justify-center mt-2">
-              <button class="btn btn-primary w-100" @click="addChannel">
-                添加通道
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- 配置Dialog -->
-    <dialog v-if="showConfigDialog" class="modal modal-open">
-      <form
-        method="dialog"
-        class="modal-box max-w-fit"
-        @submit.prevent="onConfigSubmit"
-      >
-        <h3 class="font-bold text-lg mb-4">调试器基本配置</h3>
-        <div class="flex flex-col gap-4 w-80">
-          <BaseInputField
-            v-model="config.clkFreq"
-            label="时钟频率 (MHz)"
-            type="number"
-            min="1"
-            max="200"
-            :error="
-              config.clkFreq < 1 || config.clkFreq > 500 ? '范围1~200' : ''
-            "
-            required
-          />
-          <BaseInputField
-            v-model="config.totalPortNum"
-            label="启用端口数"
-            type="number"
-            min="1"
-            max="16"
-            :error="
-              config.totalPortNum < 1 || config.totalPortNum > 16
-                ? '范围1~16'
-                : ''
-            "
-            required
-          />
-          <BaseInputField
-            v-model="config.captureDepth"
-            label="采样深度"
-            type="number"
-            min="1"
-            max="1048576"
-            :error="
-              config.captureDepth < 1 || config.captureDepth > 1048576
-                ? '范围1~1048576'
-                : ''
-            "
-            required
-          />
-        </div>
-        <div class="modal-action mt-6">
-          <button class="btn btn-primary" type="submit">确定</button>
-          <button class="btn" type="button" @click="showConfigDialog = false">
-            取消
-          </button>
-        </div>
-      </form>
-    </dialog>
   </div>
 </template>
-
 <script setup lang="ts">
-import { CaptureMode, ChannelConfig, DebuggerConfig } from "@/APIClient";
+import WaveformDisplay from '@/components/WaveformDisplay/WaveformDisplay.vue';
-import { useAlertStore } from "@/components/Alert";
-import BaseInputField from "@/components/InputField/BaseInputField.vue";
-import type { LogicDataType } from "@/components/WaveformDisplay";
-import WaveformDisplay from "@/components/WaveformDisplay/WaveformDisplay.vue";
-import { AuthManager } from "@/utils/AuthManager";
-import { useRequiredInjection } from "@/utils/Common";
-import { useLocalStorage } from "@vueuse/core";
-import axios, { type CancelTokenSource } from "axios";
-import { isNull } from "lodash";
-import { Play, Square, Zap } from "lucide-vue-next";
-import { ref, reactive, computed } from "vue";
 
-interface DebugChannel {
-  name: string;
-  visible: boolean;
-  color: string;
-  trigger: CaptureMode;
-  width: number;
-  widthStr: string;
-  start: number;
-  parentPort: number;
-}
-
-interface DebuggerSettings {
-  clkFreq: number;
-  totalPortNum: number;
-  captureDepth: number;
-}
-
-const triggerModes = [
-  { value: CaptureMode.None, label: "x (无关)" },
-  { value: CaptureMode.Logic0, label: "0 (低电平)" },
-  { value: CaptureMode.Logic1, label: "1 (高电平)" },
-  { value: CaptureMode.Rise, label: "↑ (上升沿)" },
-  { value: CaptureMode.Fall, label: "↓ (下降沿)" },
-];
-
-// 基本配置
-const config = reactive<DebuggerSettings>({
-  clkFreq: 50,
-  totalPortNum: 1,
-  captureDepth: 1024,
-});
-const configInited = ref(false);
-const showConfigDialog = ref(false);
-
-function onConfigSubmit() {
-  configInited.value = true;
-  showConfigDialog.value = false;
-  // 清空通道
-  channels.value = [];
-}
-
-// 通道配置
-const channels = useLocalStorage<DebugChannel[]>("debugger-channels", []);
-const captureData = ref<LogicDataType>();
-const alert = useRequiredInjection(useAlertStore);
-
-const isCapturing = ref(false);
-const readCancelTokenSource = ref<CancelTokenSource | null>(null);
-
-// 解析widthStr为start/width
-function parseWidthStr(idx: number) {
-  const ch = channels.value[idx];
-  const match = /^(\d+)\s*:\s*(\d+)$/.exec(ch.widthStr);
-  if (isNull(match)) {
-    alert.error("格式错误，应为 起始位:宽度，如 0:7");
-    ch.widthStr = `${ch.start}:${ch.width}`;
-    return;
-  }
-
-  const min = Math.min(parseInt(match[1]), parseInt(match[2]));
-  const max = Math.max(parseInt(match[1]), parseInt(match[2]));
-
-  ch.start = min;
-  ch.width = max - min + 1;
-}
-
-function addChannel() {
-  if (!configInited.value) {
-    alert.error("请先配置调试器基本参数");
-    return;
-  }
-  if (channels.value.length >= config.totalPortNum * 32) {
-    alert.error("通道数已达最大线宽数");
-    return;
-  }
-  channels.value.push({
-    name: `CH${channels.value.length + 1}`,
-    visible: true,
-    color: "#00bcd4",
-    trigger: CaptureMode.None,
-    width: 1,
-    widthStr: "0:0",
-    start: 0,
-    parentPort: 0,
-  });
-}
-
-function removeChannel(idx: number) {
-  channels.value.splice(idx, 1);
-}
-
-function handleDeleteData() {
-  captureData.value = undefined;
-}
-
-function stopCapture() {
-  isCapturing.value = false;
-  if (readCancelTokenSource.value) {
-    readCancelTokenSource.value.cancel("用户手动停止捕获");
-    readCancelTokenSource.value = null;
-  }
-}
-
-async function startCapture() {
-  if (!configInited.value) {
-    alert.error("请先配置调试器基本参数");
-    return;
-  }
-  if (channels.value.length === 0) {
-    alert.error("请至少添加一个通道");
-    return;
-  }
-
-  // 校验通道参数
-  let usedWires = 0;
-  for (let i = 0; i < channels.value.length; i++) {
-    const ch = channels.value[i];
-    if (!ch.visible) continue;
-    if (!ch.name) {
-      alert.error(`通道 ${i + 1} 名称不能为空`);
-      return;
-    }
-    if (ch.width < 1 || ch.width > 32) {
-      alert.error(`通道 ${i + 1} 数据位宽必须在1到32之间`);
-      return;
-    }
-    if (ch.start < 0 || ch.start + ch.width > 32) {
-      alert.error(`通道 ${i + 1} 起始位+宽度不能超过32`);
-      return;
-    }
-    if (ch.parentPort < 0 || ch.parentPort >= config.totalPortNum) {
-      alert.error(`通道 ${i + 1} 父端口编号超出范围`);
-      return;
-    }
-    usedWires += ch.width;
-  }
-  if (usedWires > config.totalPortNum * 32) {
-    alert.error("所有通道线宽总和不能超过最大线宽数");
-    return;
-  }
-
-  isCapturing.value = true;
-  const client = AuthManager.createAuthenticatedDebuggerClient();
-
-  // 构造API配置
-  const channelConfigs = channels.value
-    .filter((ch) => ch.visible)
-    .map(
-      (ch) =>
-        new ChannelConfig({
-          name: ch.name,
-          color: ch.color,
-          wireWidth: ch.width,
-          wireStartIndex: ch.start,
-          parentPort: ch.parentPort,
-          mode: ch.trigger,
-        }),
-    );
-
-  const apiConfig = new DebuggerConfig({
-    clkFreq: config.clkFreq,
-    totalPortNum: config.totalPortNum,
-    captureDepth: config.captureDepth,
-    triggerNum: 0,
-    channelConfigs: channelConfigs,
-  });
-
-  try {
-    // 设置通道模式
-    let ret = await client.setChannelsMode(apiConfig);
-    if (!ret) {
-      alert.error("设置通道模式失败");
-      isCapturing.value = false;
-      return;
-    }
-
-    // 启动捕获
-    ret = await client.startTrigger();
-    if (!ret) {
-      alert.error("开始捕获失败，请检查连接");
-      isCapturing.value = false;
-      return;
-    }
-
-    // 读取数据
-    readCancelTokenSource.value = axios.CancelToken.source();
-    const readDataPromise = client
-      .readData(apiConfig, readCancelTokenSource.value.token)
-      .then((data) => {
-        const enabledChannels = channelConfigs;
-        const sampleCount = config.captureDepth;
-
-        // 解析数据
-        const y = data.map((cd, idx) => {
-          const ch = enabledChannels[idx];
-          const bin = atob(cd.data);
-          // UInt32数组
-          const arr = [];
-          for (let i = 0; i < bin.length; i += 4) {
-            arr.push(
-              bin.charCodeAt(i) |
-                (bin.charCodeAt(i + 1) << 8) |
-                (bin.charCodeAt(i + 2) << 16) |
-                (bin.charCodeAt(i + 3) << 24),
-            );
-          }
-          // 截取采样深度
-          return {
-            enabled: true,
-            type: ch.wireWidth === 1 ? ("logic" as const) : ("number" as const),
-            name: ch.name,
-            color: ch.color,
-            value: arr.slice(0, sampleCount),
-            base: ch.wireWidth === 1 ? ("bin" as const) : ("hex" as const),
-          };
-        });
-
-        const x: number[] = [];
-        for (let i = 0; i < sampleCount; i++) {
-          x.push(i * (1 / config.clkFreq)); // us
-        }
-
-        captureData.value = {
-          x,
-          y,
-          xUnit: "us",
-        };
-      })
-      .catch((error) => {
-        if (axios.isCancel(error)) {
-          alert.info("捕获已取消");
-        } else {
-          alert.error(`读取数据失败: ${error.message}`);
-        }
-      })
-      .finally(() => {
-        isCapturing.value = false;
-        readCancelTokenSource.value = null;
-      });
-  } catch (error: any) {
-    alert.error(`开始捕获失败: ${error.message}`);
-    isCapturing.value = false;
-    return;
-  }
-}
 </script>

src/views/Project/HdmiVideoStream.vue

@@ -1,490 +0,0 @@
-<template>
-  <div class="bg-base-100 flex flex-col gap-7">
-    <!-- 控制面板 -->
-    <div class="card bg-base-200 shadow-xl mx-5">
-      <div class="card-body">
-        <h2 class="card-title text-primary">
-          <Settings class="w-6 h-6" />
-          HDMI视频流控制面板
-        </h2>
-
-        <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-          <!-- 板卡信息 -->
-          <div class="stats shadow">
-            <div class="stat bg-base-100">
-              <div class="stat-figure text-primary">
-                <div class="badge" :class="endpoint ? 'badge-success' : 'badge-warning'">
-                  {{ endpoint ? "已连接" : "未配置" }}
-                </div>
-              </div>
-              <div class="stat-title">板卡状态</div>
-              <div class="stat-value text-primary">HDMI</div>
-              <div class="stat-desc">{{ endpoint ? `板卡: ${endpoint.boardId.substring(0, 8)}...` : "请先连接板卡" }}</div>
-            </div>
-          </div>
-
-          <!-- 连接状态 -->
-          <div class="stats shadow">
-            <div class="stat bg-base-100">
-              <div class="stat-figure text-secondary">
-                <Video class="w-8 h-8" />
-              </div>
-              <div class="stat-title">视频状态</div>
-              <div class="stat-value text-secondary">
-                {{ isPlaying ? "播放中" : "未播放" }}
-              </div>
-              <div class="stat-desc">{{ videoStatus }}</div>
-            </div>
-          </div>
-        </div>
-
-        <!-- 操作按钮 -->
-        <div class="card-actions justify-end mt-4">
-          <button class="btn btn-outline btn-primary" @click="refreshEndpoint" :disabled="loading">
-            <RefreshCw v-if="loading" class="animate-spin h-4 w-4 mr-2" />
-            <RefreshCw v-else class="h-4 w-4 mr-2" />
-            {{ loading ? "刷新中..." : "刷新连接" }}
-          </button>
-          <button class="btn btn-primary" @click="testConnection" :disabled="testing || !endpoint">
-            <RefreshCw v-if="testing" class="animate-spin h-4 w-4 mr-2" />
-            <TestTube v-else class="h-4 w-4 mr-2" />
-            {{ testing ? "测试中..." : "测试连接" }}
-          </button>
-        </div>
-      </div>
-    </div>
-
-    <!-- 视频预览区域 -->
-    <div class="card bg-base-200 shadow-xl mx-5">
-      <div class="card-body">
-        <h2 class="card-title text-primary">
-          <Video class="w-6 h-6" />
-          HDMI视频预览
-        </h2>
-
-        <div class="relative bg-black rounded-lg overflow-hidden cursor-pointer" :class="[
-          { 'cursor-not-allowed': !isPlaying || hasVideoError || !endpoint }
-        ]" style="aspect-ratio: 16/9" @click="handleVideoClick">
-          <!-- 视频播放器 - 使用img标签直接显示MJPEG流 -->
-          <div v-show="isPlaying && endpoint" class="w-full h-full flex items-center justify-center">
-            <img :src="currentVideoSource" alt="HDMI视频流" class="max-w-full max-h-full object-contain"
-              @error="handleVideoError" @load="handleVideoLoad" />
-          </div>
-
-          <!-- 错误信息显示 -->
-          <div v-if="hasVideoError" class="absolute inset-0 flex items-center justify-center bg-black bg-opacity-70">
-            <div class="card bg-error text-white shadow-lg w-full max-w-lg">
-              <div class="card-body">
-                <h3 class="card-title flex items-center gap-2">
-                  <AlertTriangle class="h-6 w-6" />
-                  HDMI视频流加载失败
-                </h3>
-                <p>无法连接到HDMI视频服务器，请检查以下内容：</p>
-                <ul class="list-disc list-inside">
-                  <li>HDMI输入设备是否已连接</li>
-                  <li>板卡是否正常工作</li>
-                  <li>网络连接是否正常</li>
-                  <li>HDMI视频流服务是否已启动</li>
-                </ul>
-                <div class="card-actions justify-end mt-2">
-                  <button class="btn btn-sm btn-outline btn-primary" @click="tryReconnect">
-                    重试连接
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <!-- 占位符 -->
-          <div v-show="(!isPlaying && !hasVideoError) || !endpoint"
-            class="absolute inset-0 flex items-center justify-center text-white">
-            <div class="text-center">
-              <Video class="w-16 h-16 mx-auto mb-4 opacity-50" />
-              <p class="text-lg opacity-75">{{ videoStatus }}</p>
-              <p class="text-sm opacity-60 mt-2">
-                {{ endpoint ? '点击"播放HDMI视频流"按钮开始查看实时视频' : '请先刷新连接以获取板卡信息' }}
-              </p>
-            </div>
-          </div>
-        </div>
-
-        <!-- 视频控制 -->
-        <div class="flex justify-between items-center mt-4" v-if="endpoint">
-          <div class="text-sm text-base-content/70">
-            MJPEG地址:
-            <code class="bg-base-300 px-2 py-1 rounded text-xs">{{
-              endpoint.mjpegUrl
-            }}</code>
-          </div>
-          <div class="space-x-2">
-            <div class="dropdown dropdown-hover dropdown-top dropdown-end">
-              <div tabindex="0" role="button" class="btn btn-sm btn-outline btn-accent">
-                <MoreHorizontal class="w-4 h-4 mr-1" />
-                更多功能
-              </div>
-              <ul tabindex="0" class="dropdown-content z-[1] menu p-2 shadow bg-base-200 rounded-box w-52">
-                <li>
-                  <a @click="openInNewTab(endpoint.videoUrl)">
-                    <ExternalLink class="w-4 h-4" />
-                    在新标签打开视频页面
-                  </a>
-                </li>
-                <li>
-                  <a @click="takeSnapshot">
-                    <Camera class="w-4 h-4" />
-                    获取并下载快照
-                  </a>
-                </li>
-                <li>
-                  <a @click="copyToClipboard(endpoint.mjpegUrl)">
-                    <Copy class="w-4 h-4" />
-                    复制MJPEG地址
-                  </a>
-                </li>
-              </ul>
-            </div>
-            <button class="btn btn-success btn-sm" @click="startStream" :disabled="isPlaying || !endpoint">
-              <Play class="w-4 h-4 mr-1" />
-              播放HDMI视频流
-            </button>
-            <button class="btn btn-error btn-sm" @click="stopStream" :disabled="!isPlaying">
-              <Square class="w-4 h-4 mr-1" />
-              停止视频流
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- 日志区域 -->
-    <div class="card bg-base-200 shadow-xl mx-5">
-      <div class="card-body">
-        <h2 class="card-title text-primary">
-          <FileText class="w-6 h-6" />
-          操作日志
-        </h2>
-
-        <div class="bg-base-300 rounded-lg p-4 h-48 overflow-y-auto">
-          <div v-for="(log, index) in logs" :key="index" class="text-sm font-mono mb-1">
-            <span class="text-base-content/50">[{{ formatTime(log.time) }}]</span>
-            <span :class="getLogClass(log.level)">{{ log.message }}</span>
-          </div>
-          <div v-if="logs.length === 0" class="text-base-content/50 text-center py-8">
-            暂无日志记录
-          </div>
-        </div>
-
-        <div class="card-actions justify-end mt-2">
-          <button class="btn btn-outline btn-sm" @click="clearLogs">
-            清空日志
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted, onUnmounted } from "vue";
-import {
-  Settings,
-  Video,
-  RefreshCw,
-  TestTube,
-  Play,
-  Square,
-  ExternalLink,
-  Camera,
-  Copy,
-  FileText,
-  AlertTriangle,
-  MoreHorizontal,
-} from "lucide-vue-next";
-import { HdmiVideoStreamClient, type HdmiVideoStreamEndpoint } from "@/APIClient";
-import { AuthManager } from "@/utils/AuthManager";
-import { useAlertStore } from "@/components/Alert";
-
-// Alert系统
-const alert = useAlertStore();
-
-// 状态管理
-const loading = ref(false);
-const testing = ref(false);
-const isPlaying = ref(false);
-const hasVideoError = ref(false);
-const videoStatus = ref('未连接');
-
-// HDMI视频流数据
-const endpoint = ref<HdmiVideoStreamEndpoint | null>(null);
-const currentVideoSource = ref('');
-
-// 日志系统
-interface LogEntry {
-  time: Date;
-  level: 'info' | 'success' | 'warning' | 'error';
-  message: string;
-}
-
-const logs = ref<LogEntry[]>([]);
-
-// 添加日志
-function addLog(level: LogEntry['level'], message: string) {
-  logs.value.unshift({
-    time: new Date(),
-    level,
-    message
-  });
-  
-  // 保持最近100条日志
-  if (logs.value.length > 100) {
-    logs.value = logs.value.slice(0, 100);
-  }
-}
-
-// 格式化时间
-function formatTime(date: Date): string {
-  return date.toLocaleTimeString();
-}
-
-// 获取日志样式类
-function getLogClass(level: LogEntry['level']): string {
-  switch (level) {
-    case 'success':
-      return 'text-success';
-    case 'warning':
-      return 'text-warning';
-    case 'error':
-      return 'text-error';
-    default:
-      return 'text-base-content';
-  }
-}
-
-// 清空日志
-function clearLogs() {
-  logs.value = [];
-  addLog('info', '日志已清空');
-}
-
-// 刷新HDMI视频流端点
-async function refreshEndpoint() {
-  loading.value = true;
-  try {
-    addLog('info', '正在获取HDMI视频流端点...');
-    
-    const client = AuthManager.createAuthenticatedHdmiVideoStreamClient();
-    const result = await client.getMyEndpoint();
-    
-    if (result) {
-      endpoint.value = result;
-      videoStatus.value = '已连接板卡，可以播放视频流';
-      addLog('success', `成功获取HDMI视频流端点，板卡ID: ${result.boardId.substring(0, 8)}...`);
-      alert?.success('HDMI视频流连接成功');
-    } else {
-      endpoint.value = null;
-      videoStatus.value = '无法获取板卡信息';
-      addLog('error', '未找到绑定的板卡或板卡未配置HDMI输入');
-      alert?.error('未找到绑定的板卡');
-    }
-  } catch (error) {
-    console.error('获取HDMI视频流端点失败:', error);
-    endpoint.value = null;
-    videoStatus.value = '连接失败';
-    addLog('error', `获取HDMI视频流端点失败: ${error}`);
-    alert?.error('获取HDMI视频流信息失败');
-  } finally {
-    loading.value = false;
-  }
-}
-
-// 测试连接
-async function testConnection() {
-  if (!endpoint.value) {
-    alert?.warn('请先刷新连接获取板卡信息');
-    return;
-  }
-
-  testing.value = true;
-  try {
-    addLog('info', '正在测试HDMI视频流连接...');
-    
-    // 尝试获取快照来测试连接
-    const response = await fetch(endpoint.value.snapshotUrl, {
-      method: 'GET',
-      headers: {
-        'Cache-Control': 'no-cache'
-      }
-    });
-
-    if (response.ok) {
-      addLog('success', 'HDMI视频流连接测试成功');
-      alert?.success('HDMI连接测试成功');
-      videoStatus.value = '连接正常，可以播放视频流';
-    } else {
-      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-    }
-  } catch (error) {
-    console.error('HDMI视频流连接测试失败:', error);
-    addLog('error', `连接测试失败: ${error}`);
-    alert?.error('HDMI连接测试失败');
-    videoStatus.value = '连接测试失败';
-  } finally {
-    testing.value = false;
-  }
-}
-
-// 开始播放视频流
-function startStream() {
-  if (!endpoint.value) {
-    alert?.warn('请先刷新连接获取板卡信息');
-    return;
-  }
-
-  try {
-    // 添加时间戳防止缓存
-    const timestamp = new Date().getTime();
-    currentVideoSource.value = `${endpoint.value.mjpegUrl}&t=${timestamp}`;
-    isPlaying.value = true;
-    hasVideoError.value = false;
-    videoStatus.value = '正在加载视频流...';
-    
-    addLog('info', '开始播放HDMI视频流');
-    alert?.success('开始播放HDMI视频流');
-  } catch (error) {
-    console.error('启动HDMI视频流失败:', error);
-    addLog('error', `启动视频流失败: ${error}`);
-    alert?.error('启动HDMI视频流失败');
-  }
-}
-
-// 停止播放视频流
-function stopStream() {
-  isPlaying.value = false;
-  currentVideoSource.value = '';
-  videoStatus.value = '已停止播放';
-
-  const client = AuthManager.createAuthenticatedHdmiVideoStreamClient();
-  client.disableHdmiTransmission();
-  
-  addLog('info', '停止播放HDMI视频流');
-  alert?.info('已停止播放HDMI视频流');
-}
-
-// 处理视频加载错误
-function handleVideoError() {
-  hasVideoError.value = true;
-  videoStatus.value = '视频流加载失败';
-  addLog('error', 'HDMI视频流加载失败');
-}
-
-// 处理视频加载成功
-function handleVideoLoad() {
-  hasVideoError.value = false;
-  videoStatus.value = '视频流播放中';
-  addLog('success', 'HDMI视频流加载成功');
-}
-
-// 处理视频点击
-function handleVideoClick() {
-  if (!isPlaying.value || hasVideoError.value || !endpoint.value) {
-    return;
-  }
-  
-  // 可以在这里添加点击视频的交互逻辑
-  addLog('info', '视频画面被点击');
-}
-
-// 重试连接
-function tryReconnect() {
-  hasVideoError.value = false;
-  if (endpoint.value) {
-    startStream();
-  }
-}
-
-// 在新标签页打开视频
-function openInNewTab(url: string) {
-  window.open(url, '_blank');
-  addLog('info', '在新标签页打开HDMI视频页面');
-}
-
-// 获取快照
-async function takeSnapshot() {
-  if (!endpoint.value) {
-    alert?.warn('请先刷新连接获取板卡信息');
-    return;
-  }
-
-  try {
-    addLog('info', '正在获取HDMI视频快照...');
-    
-    const response = await fetch(endpoint.value.snapshotUrl, {
-      method: 'GET',
-      headers: {
-        'Cache-Control': 'no-cache'
-      }
-    });
-
-    if (response.ok) {
-      const blob = await response.blob();
-      const url = URL.createObjectURL(blob);
-      const a = document.createElement('a');
-      a.href = url;
-      a.download = `hdmi_snapshot_${new Date().toISOString().replace(/:/g, '-')}.jpg`;
-      document.body.appendChild(a);
-      a.click();
-      document.body.removeChild(a);
-      URL.revokeObjectURL(url);
-      
-      addLog('success', '快照下载成功');
-      alert?.success('HDMI快照下载成功');
-    } else {
-      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
-    }
-  } catch (error) {
-    console.error('获取HDMI快照失败:', error);
-    addLog('error', `获取快照失败: ${error}`);
-    alert?.error('获取HDMI快照失败');
-  }
-}
-
-// 复制到剪贴板
-async function copyToClipboard(text: string) {
-  try {
-    await navigator.clipboard.writeText(text);
-    addLog('success', '地址已复制到剪贴板');
-    alert?.success('地址已复制到剪贴板');
-  } catch (error) {
-    console.error('复制到剪贴板失败:', error);
-    addLog('error', '复制到剪贴板失败');
-    alert?.error('复制到剪贴板失败');
-  }
-}
-
-// 组件挂载时初始化
-onMounted(() => {
-  addLog('info', 'HDMI视频流界面已初始化');
-  refreshEndpoint();
-});
-
-// 组件卸载时清理
-onUnmounted(() => {
-  stopStream();
-});
-</script>
-
-<style scoped>
-/* 对焦动画效果 */
-@keyframes focus-pulse {
-  0%, 100% { 
-    box-shadow: 0 0 0 0 rgba(59, 130, 246, 0.7);
-  }
-  50% { 
-    box-shadow: 0 0 0 10px rgba(59, 130, 246, 0);
-  }
-}
-
-.focus-animation {
-  animation: focus-pulse 1s ease-out;
-}
-</style>

src/views/Project/Index.vue

@@ -29,7 +29,6 @@
               <DiagramCanvas
                 ref="diagramCanvas"
                 :showDocPanel="showDocPanel"
-                :exam-id="(route.query.examId as string) || ''"
                 @open-components="openComponentsMenu"
                 @toggle-doc-panel="toggleDocPanel"
               />
@@ -37,13 +36,13 @@
             <!-- 拖拽分割线 -->
             <SplitterResizeHandle
               id="splitter-group-h-resize-handle"
-              class="w-1 bg-base-300"
+              class="w-2 bg-base-100 hover:bg-primary hover:opacity-70 transition-colors"
             />
             <!-- 右侧编辑区域 -->
             <SplitterPanel
               id="splitter-group-h-panel-properties"
               :min-size="20"
-              class="bg-base-100 h-full overflow-hidden flex flex-col"
+              class="bg-base-200 h-full overflow-hidden flex flex-col"
             >
               <div class="overflow-y-auto flex-1">
                 <!-- 使用条件渲染显示不同的面板 -->
@@ -60,10 +59,7 @@
                   v-show="showDocPanel"
                   class="doc-panel overflow-y-auto h-full"
                 >
-                  <MarkdownRenderer 
+                  <MarkdownRenderer :content="documentContent" />
-                    :content="documentContent" 
-                    :examId="(route.query.examId as string) || ''"
-                  />
                 </div>
               </div>
             </SplitterPanel>
@@ -74,7 +70,7 @@
         <SplitterResizeHandle
           v-show="!isBottomBarFullscreen"
           id="splitter-group-v-resize-handle"
-          class="h-1 bg-base-300"
+          class="h-2 bg-base-100 hover:bg-primary hover:opacity-70 transition-colors"
         />
 
         <!-- 功能底栏 -->
@@ -104,32 +100,11 @@
       @close="handleRequestBoardClose"
       @success="handleRequestBoardSuccess"
     />
-
-    <!-- Navbar切换浮动按钮 -->
-    <div 
-      class="navbar-toggle-btn"
-      :class="{ 'with-navbar': navbarControl.showNavbar.value }"
-    >
-      <button 
-        @click="navbarControl.toggleNavbar"
-        class="btn btn-circle btn-primary shadow-lg hover:shadow-xl transition-all duration-300"
-        :class="{ 'btn-outline': navbarControl.showNavbar.value }"
-        :title="navbarControl.showNavbar.value ? '隐藏顶部导航栏' : '显示顶部导航栏'"
-      >
-        <!-- 使用SVG图标表示菜单/关闭状态 -->
-        <svg v-if="navbarControl.showNavbar.value" xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
-        </svg>
-        <svg v-else xmlns="http://www.w3.org/2000/svg" class="h-6 w-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-          <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
-        </svg>
-      </button>
-    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, onMounted, watch, inject, type Ref } from "vue";
+import { ref, onMounted, watch } from "vue";
 import { useRouter } from "vue-router";
 import { useLocalStorage } from '@vueuse/core'; // 添加VueUse导入
 import { SplitterGroup, SplitterPanel, SplitterResizeHandle } from "reka-ui";
@@ -140,6 +115,7 @@ import MarkdownRenderer from "@/components/MarkdownRenderer.vue";
 import BottomBar from "@/views/Project/BottomBar.vue";
 import RequestBoardDialog from "@/views/Project/RequestBoardDialog.vue";
 import { useProvideComponentManager } from "@/components/LabCanvas";
+import type { DiagramData } from "@/components/LabCanvas";
 import { useAlertStore } from "@/components/Alert";
 import { AuthManager } from "@/utils/AuthManager";
 import { useEquipments } from "@/stores/equipments";
@@ -157,12 +133,6 @@ const equipments = useEquipments();
 
 const alert = useAlertStore();
 
-// --- Navbar控制 ---
-const navbarControl = inject('navbar') as {
-  showNavbar: Ref<boolean>;
-  toggleNavbar: () => void;
-};
-
 // --- 使用VueUse保存分栏状态 ---
 // 左右分栏比例（默认60%）
 const horizontalSplitterSize = useLocalStorage('project-horizontal-splitter-size', 60);
@@ -212,37 +182,29 @@ async function toggleDocPanel() {
 // 加载文档内容
 async function loadDocumentContent() {
   try {
-    // 检查是否有实验ID参数
+    // 从路由参数中获取教程ID
-    const examId = route.query.examId as string;
+    const tutorialId = (route.query.tutorial as string) || "02"; // 默认加载02例程
-    if (examId) {
-      // 如果有实验ID，从API加载实验文档
-      console.log('加载实验文档:', examId);
-      const client = AuthManager.createAuthenticatedResourceClient();
 
-      // 获取markdown类型的模板资源列表
+    // 构建文档路径
-      const resources = await client.getResourceList(examId, 'doc', 'template');
+    let docPath = `/doc/${tutorialId}/doc.md`;
 
-      if (resources && resources.length > 0) {
+    // 检查当前路径是否包含下划线（例如 02_key 格式）
-        // 获取第一个markdown资源
+    // 如果不包含，那么使用更新的命名格式
-        const markdownResource = resources[0];
+    if (!tutorialId.includes("_")) {
-        
+      docPath = `/doc/${tutorialId}/doc.md`;
-        // 使用新的ResourceClient API获取资源文件内容
-        const response = await client.getResourceById(markdownResource.id);
-        
-        if (!response || !response.data) {
-          throw new Error('获取markdown文件失败');
     }
 
-        const content = await response.data.text();
+    // 获取文档内容
+    const response = await fetch(docPath);
+    if (!response.ok) {
+      throw new Error(`Failed to load document: ${response.status}`);
+    }
 
-        // 更新文档内容，暂时不处理图片路径，由MarkdownRenderer处理
+    // 更新文档内容，并替换图片路径
-        documentContent.value = content;
+    documentContent.value = (await response.text()).replace(
-      } else {
+      /.\/images/gi,
-        documentContent.value = "# 暂无实验文档\n\n该实验尚未提供文档内容。";
+      `/doc/${tutorialId}/images`,
-      }
+    );
-    } else {
-      documentContent.value = "# 无文档";
-    }
   } catch (error) {
     console.error("加载文档失败:", error);
     documentContent.value = "# 文档加载失败\n\n无法加载请求的文档。";
@@ -306,8 +268,8 @@ async function checkAndInitializeBoard() {
 
 // 根据实验板信息更新equipment store
 function updateEquipmentFromBoard(board: Board) {
-  equipments.boardAddr = board.ipAddr;
+  equipments.setAddr(board.ipAddr);
-  equipments.boardPort = board.port;
+  equipments.setPort(board.port);
   
   console.log(`实验板信息已更新到equipment store:`, {
     address: board.ipAddr,
@@ -350,8 +312,8 @@ onMounted(async () => {
   // 检查并初始化用户实验板
   await checkAndInitializeBoard();
 
-  // 检查是否有例程参数或实验ID参数，如果有则自动打开文档面板
+  // 检查是否有例程参数，如果有则自动打开文档面板
-  if (route.query.tutorial || route.query.examId) {
+  if (route.query.tutorial) {
     showDocPanel.value = true;
     await loadDocumentContent();
   }
@@ -382,7 +344,7 @@ onMounted(async () => {
   }
 }
 
-/* 确保整个页面禁止滚动 */
+/* 确保滚动行为仅在需要时出现 */
 html,
 body {
   overflow: hidden;
@@ -414,42 +376,7 @@ body {
 :deep(.markdown-content) {
   padding: 1rem;
   background-color: hsl(var(--b1));
-}
+  border-radius: 0.5rem;
-
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-/* Navbar切换浮动按钮样式 */
-.navbar-toggle-btn {
-  position: fixed;
-  top: 20px;
-  left: 20px;
-  z-index: 1000;
-  transition: all 0.3s ease-in-out;
-}
-
-/* 当Navbar显示时，调整按钮位置 */
-.navbar-toggle-btn.with-navbar {
-  top: 80px; /* 调整到Navbar下方 */
-}
-
-.navbar-toggle-btn button {
-  backdrop-filter: blur(10px);
-  background: rgba(var(--p), 0.9);
-  border: 2px solid rgba(var(--p), 0.3);
-  transition: all 0.3s ease-in-out;
-}
-
-.navbar-toggle-btn button:hover {
-  transform: scale(1.1);
-  background: rgba(var(--p), 1);
-}
-
-.navbar-toggle-btn button.btn-outline {
-  background: rgba(var(--b1), 0.9);
-  color: hsl(var(--p));
-  border: 2px solid rgba(var(--p), 0.5);
-}
-
-.navbar-toggle-btn button.btn-outline:hover {
-  background: rgba(var(--p), 0.1);
-  border: 2px solid rgba(var(--p), 0.8);
 }
 </style>

src/views/Project/LogicAnalyzer.vue

@@ -9,42 +9,8 @@
             逻辑信号分析
           </div>
           <div class="flex items-center gap-2">
-            <!-- 空闲状态：只显示开始捕获按钮 -->
-            <button 
-              v-if="!analyzer.isCapturing.value"
-              @click="analyzer.startCapture"
-              :disabled="analyzer.isApplying.value"
-              class="btn btn-sm btn-primary"
-            >
-              开始捕获
-            </button>
-            
-            <!-- 捕获状态：显示停止捕获和强制捕获按钮 -->
-            <button 
-              v-if="analyzer.isCapturing.value"
-              @click="analyzer.stopCapture"
-              class="btn btn-sm btn-warning"
-            >
-              <span class="loading loading-spinner loading-sm"></span>
-              停止捕获
-            </button>
-            <button 
-              v-if="analyzer.isCapturing.value"
-              @click="analyzer.forceCapture"
-              class="btn btn-sm btn-secondary"
-            >
-              强制捕获
-            </button>
-            
-            <!-- 其他按钮保持不变 -->
-            <button 
-              @click="analyzer.generateTestData"
-              class="btn btn-sm btn-info"
-            >
-              测试数据
-            </button>
             <button class="btn btn-sm btn-error" @click="handleDeleteData">
-              清空数据
+              清空
             </button>
           </div>
         </h2>
@@ -55,38 +21,9 @@
     <!-- 触发设置 -->
     <div class="card bg-base-200 shadow-xl mx-5">
       <div class="card-body">
-        <h2 class="card-title flex justify-between items-center">
+        <h2 class="card-title">
-          <div class="flex gap-8">
-            <div class="flex items-center gap-2">
           <Settings class="w-5 h-5" />
           触发设置
-            </div>
-          </div>
-          <div class="flex items-center gap-4">
-            <!-- 状态指示 -->
-            <div class="flex items-center gap-2 text-sm">
-              <span 
-                v-if="analyzer.isCapturing.value" 
-                class="flex items-center gap-1 text-warning"
-              >
-                <span class="loading loading-spinner loading-xs"></span>
-                捕获中
-              </span>
-              <span 
-                v-else-if="analyzer.isApplying.value" 
-                class="flex items-center gap-1 text-info"
-              >
-                <span class="loading loading-spinner loading-xs"></span>
-                配置中
-              </span>
-              <span 
-                v-else 
-                class="text-success"
-              >
-                就绪
-              </span>
-            </div>
-          </div>
         </h2>
         <TriggerSettings />
       </div>

vite.config.ts

@@ -1,13 +1,13 @@
-import { fileURLToPath, URL } from "node:url";
+import { fileURLToPath, URL } from 'node:url'
 
-import { defineConfig } from "vite";
+import { defineConfig } from 'vite'
-import vue from "@vitejs/plugin-vue";
+import vue from '@vitejs/plugin-vue'
-import vueJsx from "@vitejs/plugin-vue-jsx";
+import vueJsx from '@vitejs/plugin-vue-jsx'
-import vueDevTools from "vite-plugin-vue-devtools";
+import vueDevTools from 'vite-plugin-vue-devtools'
-import tailwindcss from "@tailwindcss/postcss";
+import tailwindcss from '@tailwindcss/postcss'
-import autoprefixer from "autoprefixer";
+import autoprefixer from 'autoprefixer'
-import Components from "unplugin-vue-components/vite";
+import Components from 'unplugin-vue-components/vite'
-import RekaResolver from "reka-ui/resolver";
+import RekaResolver from 'reka-ui/resolver'
 
 // https://vite.dev/config/
 export default defineConfig({
@@ -16,44 +16,49 @@ export default defineConfig({
       template: {
         compilerOptions: {
           // 将所有 wokwi- 开头的标签视为自定义元素
-          isCustomElement: (tag) => tag.startsWith("wokwi-"),
+          isCustomElement: (tag) => tag.startsWith('wokwi-')
-        },
+        }
-      },
+      }
     }),
     vueJsx(),
     vueDevTools(),
-    Components({
+    Components(
+      {
       dts: true,
       resolvers: [
-        RekaResolver(),
+        RekaResolver()
 
         // RekaResolver({
         //   prefix: '' // use the prefix option to add Prefix to the imported components
         // })
       ],
-    }),
+    }
+    )
   ],
   resolve: {
     alias: {
-      "@": fileURLToPath(new URL("./src", import.meta.url)),
+      '@': fileURLToPath(new URL('./src', import.meta.url))
     },
   },
   css: {
     postcss: {
-      plugins: [tailwindcss(), autoprefixer()],
+      plugins: [
-    },
+        tailwindcss(),
+        autoprefixer()
+      ]
+    }
   },
   build: {
-    outDir: "wwwroot",
+    outDir: 'wwwroot',
     emptyOutDir: true, // also necessary
   },
   server: {
     proxy: {
       "/swagger": {
-        target: "http://localhost:5000",
+        target: 'http://localhost:5000',
-        changeOrigin: true,
+        changeOrigin: true
-      },
+      }
     },
     port: 5173,
-  },
+  }
-});
+})