From ef138d76aa8e43a956750ae4c5acfe0105e34565 Mon Sep 17 00:00:00 2001 From: gil zhang Date: Tue, 4 Apr 2023 00:28:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7dotnet=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=BA7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ElectronBot.BraincasePreview.BgTaskComponent.csproj | 2 +- .../Verdure.ElectronBot.Core.csproj | 2 +- .../ElectronBot.BraincasePreview.csproj | 2 +- src/ElectronBot.DotNet/ElectronBot.DotNet.csproj | 2 +- src/GestureClassification/GestureClassification.csproj | 2 +- src/Mediapipe.Net/Mediapipe.Net.csproj | 2 +- .../Verdure.ElectronBot.GrpcService.csproj | 2 +- src/Verdure.NotificationArea/Verdure.NotificationArea.csproj | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ElectronBot.BraincasePreview.BgTaskComponent/ElectronBot.BraincasePreview.BgTaskComponent.csproj b/src/ElectronBot.BraincasePreview.BgTaskComponent/ElectronBot.BraincasePreview.BgTaskComponent.csproj index 15727b4..3b69aad 100644 --- a/src/ElectronBot.BraincasePreview.BgTaskComponent/ElectronBot.BraincasePreview.BgTaskComponent.csproj +++ b/src/ElectronBot.BraincasePreview.BgTaskComponent/ElectronBot.BraincasePreview.BgTaskComponent.csproj @@ -1,7 +1,7 @@  - net6.0-windows10.0.19041.0 + net7.0-windows10.0.19041.0 x86;x64;arm64;AnyCPU win10-x86;win10-x64;win10-arm64 diff --git a/src/ElectronBot.BraincasePreview.Core/Verdure.ElectronBot.Core.csproj b/src/ElectronBot.BraincasePreview.Core/Verdure.ElectronBot.Core.csproj index 1a94be6..7d81b6a 100644 --- a/src/ElectronBot.BraincasePreview.Core/Verdure.ElectronBot.Core.csproj +++ b/src/ElectronBot.BraincasePreview.Core/Verdure.ElectronBot.Core.csproj @@ -1,6 +1,6 @@  - net6.0 + net7.0 Verdure.ElectronBot.Core AnyCPU;x64;x86 x86;x64;arm64;AnyCPU diff --git a/src/ElectronBot.BraincasePreview/ElectronBot.BraincasePreview.csproj b/src/ElectronBot.BraincasePreview/ElectronBot.BraincasePreview.csproj index eb814cb..0ddcff1 100644 --- a/src/ElectronBot.BraincasePreview/ElectronBot.BraincasePreview.csproj +++ b/src/ElectronBot.BraincasePreview/ElectronBot.BraincasePreview.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows10.0.19041.0 + net7.0-windows10.0.19041.0 10.0.19041.0 ElectronBot.BraincasePreview Assets/WindowIcon.ico diff --git a/src/ElectronBot.DotNet/ElectronBot.DotNet.csproj b/src/ElectronBot.DotNet/ElectronBot.DotNet.csproj index 50acef0..bd6e5a2 100644 --- a/src/ElectronBot.DotNet/ElectronBot.DotNet.csproj +++ b/src/ElectronBot.DotNet/ElectronBot.DotNet.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable 1.0.3 diff --git a/src/GestureClassification/GestureClassification.csproj b/src/GestureClassification/GestureClassification.csproj index eefcde3..4771411 100644 --- a/src/GestureClassification/GestureClassification.csproj +++ b/src/GestureClassification/GestureClassification.csproj @@ -1,7 +1,7 @@  Library - net6.0 + net7.0 enable enable diff --git a/src/Mediapipe.Net/Mediapipe.Net.csproj b/src/Mediapipe.Net/Mediapipe.Net.csproj index 4a3c998..212117a 100644 --- a/src/Mediapipe.Net/Mediapipe.Net.csproj +++ b/src/Mediapipe.Net/Mediapipe.Net.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 true disable enable diff --git a/src/Verdure.ElectronBot.GrpcService/Verdure.ElectronBot.GrpcService.csproj b/src/Verdure.ElectronBot.GrpcService/Verdure.ElectronBot.GrpcService.csproj index 19f23da..e1ff465 100644 --- a/src/Verdure.ElectronBot.GrpcService/Verdure.ElectronBot.GrpcService.csproj +++ b/src/Verdure.ElectronBot.GrpcService/Verdure.ElectronBot.GrpcService.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/src/Verdure.NotificationArea/Verdure.NotificationArea.csproj b/src/Verdure.NotificationArea/Verdure.NotificationArea.csproj index b228e03..a5c7c4a 100644 --- a/src/Verdure.NotificationArea/Verdure.NotificationArea.csproj +++ b/src/Verdure.NotificationArea/Verdure.NotificationArea.csproj @@ -1,6 +1,6 @@  - net6.0-windows10.0.19041.0 + net7.0-windows10.0.19041.0 10.0.17763.0 Verdure.NotificationArea win10-x86;win10-x64;win10-arm64 From 5b65bee295548dbaf3c0db987f2517753a5b1aa8 Mon Sep 17 00:00:00 2001 From: gil zhang Date: Tue, 18 Apr 2023 23:54:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=89=8B=E5=8A=BF?= =?UTF-8?q?=E8=AF=86=E5=88=ABsdk=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Mediapipe.Net/Mediapipe.Net.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mediapipe.Net/Mediapipe.Net.csproj b/src/Mediapipe.Net/Mediapipe.Net.csproj index 212117a..4a3c998 100644 --- a/src/Mediapipe.Net/Mediapipe.Net.csproj +++ b/src/Mediapipe.Net/Mediapipe.Net.csproj @@ -1,7 +1,7 @@ - net7.0 + net6.0 true disable enable From b585941876b0d7cd24c4ac52fd630628615f8850 Mon Sep 17 00:00:00 2001 From: gil zhang Date: Wed, 19 Apr 2023 00:23:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E6=96=B9=E6=A1=88=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ElectronBot.Braincase.sln | 167 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 ElectronBot.Braincase.sln diff --git a/ElectronBot.Braincase.sln b/ElectronBot.Braincase.sln new file mode 100644 index 0000000..45e1db2 --- /dev/null +++ b/ElectronBot.Braincase.sln @@ -0,0 +1,167 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32819.101 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ElectronBot.DotNet", "src\ElectronBot.DotNet\ElectronBot.DotNet.csproj", "{8FD16BB5-D953-44CB-8709-A79998337A1C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ElectronBot.BraincasePreview", "src\ElectronBot.BraincasePreview\ElectronBot.BraincasePreview.csproj", "{66DA4526-14E4-4CCA-A7CE-F4566061E38C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Verdure.ElectronBot.Core", "src\ElectronBot.BraincasePreview.Core\Verdure.ElectronBot.Core.csproj", "{DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{9F74F31F-8D9D-4E35-82A9-50D16B1B5EA3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ElectronBot.BraincasePreview.BgTaskComponent", "src\ElectronBot.BraincasePreview.BgTaskComponent\ElectronBot.BraincasePreview.BgTaskComponent.csproj", "{03BA2503-5F31-45CB-8C42-873618F4EA87}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediapipe.Net", "src\Mediapipe.Net\Mediapipe.Net.csproj", "{C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GestureClassification", "src\GestureClassification\GestureClassification.csproj", "{A0D30D71-687D-44C7-A932-D9F15F001B71}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Verdure.NotificationArea", "src\Verdure.NotificationArea\Verdure.NotificationArea.csproj", "{2DD1EED6-1778-41DF-9E0D-EC23C99416B4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|arm64 = Debug|arm64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|arm64 = Release|arm64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Debug|arm64.ActiveCfg = Debug|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Debug|arm64.Build.0 = Debug|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Debug|x64.ActiveCfg = Debug|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Debug|x64.Build.0 = Debug|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Debug|x86.ActiveCfg = Debug|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Debug|x86.Build.0 = Debug|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Release|Any CPU.Build.0 = Release|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Release|arm64.ActiveCfg = Release|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Release|arm64.Build.0 = Release|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Release|x64.ActiveCfg = Release|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Release|x64.Build.0 = Release|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Release|x86.ActiveCfg = Release|Any CPU + {8FD16BB5-D953-44CB-8709-A79998337A1C}.Release|x86.Build.0 = Release|Any CPU + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|Any CPU.ActiveCfg = Debug|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|Any CPU.Build.0 = Debug|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|Any CPU.Deploy.0 = Debug|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|arm64.ActiveCfg = Debug|arm64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|arm64.Build.0 = Debug|arm64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|arm64.Deploy.0 = Debug|arm64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|x64.ActiveCfg = Debug|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|x64.Build.0 = Debug|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|x64.Deploy.0 = Debug|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|x86.ActiveCfg = Debug|x86 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|x86.Build.0 = Debug|x86 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Debug|x86.Deploy.0 = Debug|x86 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|Any CPU.ActiveCfg = Release|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|Any CPU.Build.0 = Release|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|Any CPU.Deploy.0 = Release|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|arm64.ActiveCfg = Release|arm64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|arm64.Build.0 = Release|arm64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|arm64.Deploy.0 = Release|arm64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|x64.ActiveCfg = Release|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|x64.Build.0 = Release|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|x64.Deploy.0 = Release|x64 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|x86.ActiveCfg = Release|x86 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|x86.Build.0 = Release|x86 + {66DA4526-14E4-4CCA-A7CE-F4566061E38C}.Release|x86.Deploy.0 = Release|x86 + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Debug|arm64.ActiveCfg = Debug|arm64 + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Debug|arm64.Build.0 = Debug|arm64 + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Debug|x64.ActiveCfg = Debug|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Debug|x64.Build.0 = Debug|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Debug|x86.ActiveCfg = Debug|x86 + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Debug|x86.Build.0 = Debug|x86 + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Release|Any CPU.Build.0 = Release|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Release|arm64.ActiveCfg = Release|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Release|arm64.Build.0 = Release|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Release|x64.ActiveCfg = Release|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Release|x64.Build.0 = Release|Any CPU + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Release|x86.ActiveCfg = Release|x86 + {DF6F2FCC-F99A-4F3B-A7D1-B793FF477F1A}.Release|x86.Build.0 = Release|x86 + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Debug|arm64.ActiveCfg = Debug|x64 + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Debug|arm64.Build.0 = Debug|x64 + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Debug|x64.ActiveCfg = Debug|x64 + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Debug|x64.Build.0 = Debug|x64 + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Debug|x86.ActiveCfg = Debug|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Debug|x86.Build.0 = Debug|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Release|Any CPU.Build.0 = Release|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Release|arm64.ActiveCfg = Release|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Release|arm64.Build.0 = Release|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Release|x64.ActiveCfg = Release|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Release|x64.Build.0 = Release|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Release|x86.ActiveCfg = Release|Any CPU + {03BA2503-5F31-45CB-8C42-873618F4EA87}.Release|x86.Build.0 = Release|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Debug|arm64.ActiveCfg = Debug|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Debug|arm64.Build.0 = Debug|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Debug|x64.ActiveCfg = Debug|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Debug|x64.Build.0 = Debug|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Debug|x86.ActiveCfg = Debug|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Debug|x86.Build.0 = Debug|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Release|Any CPU.Build.0 = Release|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Release|arm64.ActiveCfg = Release|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Release|arm64.Build.0 = Release|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Release|x64.ActiveCfg = Release|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Release|x64.Build.0 = Release|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Release|x86.ActiveCfg = Release|Any CPU + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC}.Release|x86.Build.0 = Release|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Debug|arm64.ActiveCfg = Debug|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Debug|arm64.Build.0 = Debug|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Debug|x64.ActiveCfg = Debug|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Debug|x64.Build.0 = Debug|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Debug|x86.ActiveCfg = Debug|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Debug|x86.Build.0 = Debug|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Release|Any CPU.Build.0 = Release|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Release|arm64.ActiveCfg = Release|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Release|arm64.Build.0 = Release|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Release|x64.ActiveCfg = Release|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Release|x64.Build.0 = Release|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Release|x86.ActiveCfg = Release|Any CPU + {A0D30D71-687D-44C7-A932-D9F15F001B71}.Release|x86.Build.0 = Release|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Debug|arm64.ActiveCfg = Debug|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Debug|arm64.Build.0 = Debug|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Debug|x64.ActiveCfg = Debug|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Debug|x64.Build.0 = Debug|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Debug|x86.ActiveCfg = Debug|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Debug|x86.Build.0 = Debug|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Release|Any CPU.Build.0 = Release|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Release|arm64.ActiveCfg = Release|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Release|arm64.Build.0 = Release|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Release|x64.ActiveCfg = Release|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Release|x64.Build.0 = Release|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Release|x86.ActiveCfg = Release|Any CPU + {2DD1EED6-1778-41DF-9E0D-EC23C99416B4}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {66DA4526-14E4-4CCA-A7CE-F4566061E38C} = {9F74F31F-8D9D-4E35-82A9-50D16B1B5EA3} + {03BA2503-5F31-45CB-8C42-873618F4EA87} = {9F74F31F-8D9D-4E35-82A9-50D16B1B5EA3} + {C017AF7A-B69D-4A70-BA6C-15501E6EDAEC} = {9F74F31F-8D9D-4E35-82A9-50D16B1B5EA3} + {A0D30D71-687D-44C7-A932-D9F15F001B71} = {9F74F31F-8D9D-4E35-82A9-50D16B1B5EA3} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0EBF82F3-30A6-4BCC-950A-360C126FC118} + EndGlobalSection +EndGlobal From ba7891ce0c75dfa53461723062b6afcf0a1848bc Mon Sep 17 00:00:00 2001 From: gil zhang Date: Thu, 27 Apr 2023 00:41:31 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=9A=84=E6=8B=94=E6=8F=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Helpers/ElectronBotHelper.cs | 54 +++++++++---------- .../Services/EmoticonActionFrameService.cs | 1 + .../ViewModels/MainViewModel.cs | 14 ++++- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/ElectronBot.BraincasePreview/Helpers/ElectronBotHelper.cs b/src/ElectronBot.BraincasePreview/Helpers/ElectronBotHelper.cs index 57b1893..e3a2075 100644 --- a/src/ElectronBot.BraincasePreview/Helpers/ElectronBotHelper.cs +++ b/src/ElectronBot.BraincasePreview/Helpers/ElectronBotHelper.cs @@ -3,8 +3,10 @@ using System.Text.Json; using System.Text.RegularExpressions; using ElectronBot.BraincasePreview.Contracts.Services; using ElectronBot.BraincasePreview.Models; +using ElectronBot.BraincasePreview.Services; using ElectronBot.DotNet; using Microsoft.Extensions.Logging; +using Services; using Verdure.ElectronBot.Core.Models; using Windows.ApplicationModel; using Windows.Devices.Enumeration; @@ -32,6 +34,7 @@ public class ElectronBotHelper private DeviceWatcher? deviceWatcher; public event EventHandler? ClockCanvasStop; + public event EventHandler? ClockCanvasStart; public event EventHandler? PlayEmojisRandom; @@ -58,6 +61,12 @@ public class ElectronBotHelper ClockCanvasStop?.Invoke(this, new EventArgs()); } + public void InvokeClockCanvasStart() + { + ClockCanvasStart?.Invoke(this, new EventArgs()); + } + + public SerialPort SerialPort { get; set; } = new SerialPort(); public async Task InitAsync() @@ -204,13 +213,22 @@ public class ElectronBotHelper { try { - if (ElectronBot is not null) - { - ElectronBot.Disconnect(); + //InvokeClockCanvasStop(); - ElectronBot = null; - } + var service = App.GetService(); + service.ClearQueue(); + + Thread.Sleep(1000); + + IntelligenceService.Current.CleanUp(); + + await CameraService.Current.CleanupMediaCaptureAsync(); + + await CameraFrameService.Current.CleanupMediaCaptureAsync(); + + ElectronBot?.Disconnect(); + if (SerialPort.IsOpen) { SerialPort.Close(); @@ -225,29 +243,6 @@ public class ElectronBotHelper EbConnected = false; await DisconnectDeviceAsync(); - //if (_electronDic.TryGetValue(args.Id, out var value)) - //{ - // if (value != null) - // { - // _electronDic.Remove(args.Id); - - // if (ElectronBot is not null) - // { - // ElectronBot.Disconnect(); - - // ElectronBot = null; - // } - - // if (SerialPort.IsOpen) - // { - // SerialPort.Close(); - // } - - // EbConnected = false; - - // await DisconnectDeviceAsync(); - // } - //}; } private async void OnDeviceAdded(DeviceWatcher sender, DeviceInformation args) @@ -299,11 +294,14 @@ public class ElectronBotHelper ElectronBot = null; } + Thread.Sleep(5000); ElectronBot = new ElectronLowLevel(App.GetService>()); EbConnected = ElectronBot.Connect(); + //InvokeClockCanvasStart(); + await ConnectDeviceAsync(); } catch (Exception ex) diff --git a/src/ElectronBot.BraincasePreview/Services/EmoticonActionFrameService.cs b/src/ElectronBot.BraincasePreview/Services/EmoticonActionFrameService.cs index 8174fa3..8852e6c 100644 --- a/src/ElectronBot.BraincasePreview/Services/EmoticonActionFrameService.cs +++ b/src/ElectronBot.BraincasePreview/Services/EmoticonActionFrameService.cs @@ -27,6 +27,7 @@ public class EmoticonActionFrameService public void ClearQueue() { + Interlocked.Exchange(ref _isSending, 0); _queue.Clear(); } diff --git a/src/ElectronBot.BraincasePreview/ViewModels/MainViewModel.cs b/src/ElectronBot.BraincasePreview/ViewModels/MainViewModel.cs index 3bb344c..f7c7328 100644 --- a/src/ElectronBot.BraincasePreview/ViewModels/MainViewModel.cs +++ b/src/ElectronBot.BraincasePreview/ViewModels/MainViewModel.cs @@ -108,11 +108,23 @@ public partial class MainViewModel : ObservableRecipient, INavigationAware ElectronBotHelper.Instance.SerialPort.DataReceived += SerialPort_DataReceived; ElectronBotHelper.Instance.ClockCanvasStop += Instance_ClockCanvasStop; + ElectronBotHelper.Instance.ClockCanvasStart += Instance_ClockCanvasStart; + } + + private void Instance_ClockCanvasStart(object? sender, EventArgs e) + { + App.MainWindow.DispatcherQueue.TryEnqueue(() => + { + _dispatcherTimer.Start(); + }); } private void Instance_ClockCanvasStop(object? sender, EventArgs e) { - _dispatcherTimer.Stop(); + App.MainWindow.DispatcherQueue.TryEnqueue(() => + { + _dispatcherTimer.Stop(); + }); } [ObservableProperty] From c08013c8b90ab24615630c566962d71e631d0b05 Mon Sep 17 00:00:00 2001 From: gil zhang Date: Fri, 28 Apr 2023 00:19:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=96=B01.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controls/MarketplacePage.xaml | 1 + src/ElectronBot.BraincasePreview/Package.appxmanifest | 2 +- .../Strings/en-us/Resources.resw | 6 +++++- .../Strings/zh-cn/Resources.resw | 6 +++++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/ElectronBot.BraincasePreview/Controls/MarketplacePage.xaml b/src/ElectronBot.BraincasePreview/Controls/MarketplacePage.xaml index f2d37ef..0cffe6a 100644 --- a/src/ElectronBot.BraincasePreview/Controls/MarketplacePage.xaml +++ b/src/ElectronBot.BraincasePreview/Controls/MarketplacePage.xaml @@ -69,6 +69,7 @@ Style="{ThemeResource BodyTextBlockStyle}" TextTrimming="CharacterEllipsis" /> + Version="1.5.1.0" /> 电子脑壳 diff --git a/src/ElectronBot.BraincasePreview/Strings/en-us/Resources.resw b/src/ElectronBot.BraincasePreview/Strings/en-us/Resources.resw index b58d822..98a09f8 100644 --- a/src/ElectronBot.BraincasePreview/Strings/en-us/Resources.resw +++ b/src/ElectronBot.BraincasePreview/Strings/en-us/Resources.resw @@ -544,7 +544,11 @@ 删除 - 1.5.0 版本更新说明 + 1.5.1 版本更新说明 +1. 重构代码升级框架到.net7和windows app sdk 1.3。 +2. 优化电子连接，可以打开电子脑壳，然后插入电子，热拔插也进行修复，为后期功能打下稳定的基础。 + +1.5.0 版本更新说明 1. 添加在线表情分享功能，类似于表情商城的功能，可以分享下载表情文件。 2. 调整UI显示，优化弹窗的明暗主题色。 diff --git a/src/ElectronBot.BraincasePreview/Strings/zh-cn/Resources.resw b/src/ElectronBot.BraincasePreview/Strings/zh-cn/Resources.resw index 66a8128..f621c95 100644 --- a/src/ElectronBot.BraincasePreview/Strings/zh-cn/Resources.resw +++ b/src/ElectronBot.BraincasePreview/Strings/zh-cn/Resources.resw @@ -547,7 +547,11 @@ 删除 - 1.5.0 版本更新说明 + 1.5.1 版本更新说明 +1. 重构代码升级框架到.net7和windows app sdk 1.3。 +2. 优化电子连接，可以打开电子脑壳，然后插入电子，热拔插也进行修复，为后期功能打下稳定的基础。 + +1.5.0 版本更新说明 1. 添加在线表情分享功能，类似于表情商城的功能，可以分享下载表情文件。 2. 调整UI显示，优化弹窗的明暗主题色。