GithubStar/ElectronBot.DotNet
1
0
Fork 0
mirror of https://github.com/maker-community/ElectronBot.DotNet.git synced 2026-10-20 23:58:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from GreenShadeZhang/optimize_code

Browse Source 
Optimize code
This commit is contained in:
Gil Zhang
2023-04-28 09:29:44 +08:00
committed by GitHub
parent add2fa8303 c08013c8b9
commit cd3512271d
15 changed files with 226 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElectronBot.Braincase.sln
+167
View File
@@ -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
src/ElectronBot.BraincasePreview.BgTaskComponent/ElectronBot.BraincasePreview.BgTaskComponent.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
<Platforms>x86;x64;arm64;AnyCPU</Platforms>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
<RootNamespace></RootNamespace>
src/ElectronBot.BraincasePreview.Core/Verdure.ElectronBot.Core.csproj
+1 -1
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>Verdure.ElectronBot.Core</RootNamespace>
<Platforms>AnyCPU;x64;x86</Platforms>
<Platforms>x86;x64;arm64;AnyCPU</Platforms>
src/ElectronBot.BraincasePreview/Controls/MarketplacePage.xaml
+1
View File
@@ -69,6 +69,7 @@
Style="{ThemeResource BodyTextBlockStyle}"
TextTrimming="CharacterEllipsis" />
<TextBlock
Width="240"
Margin="0,4,0,0"
FontWeight="Normal"
MaxLines="2"
src/ElectronBot.BraincasePreview/ElectronBot.BraincasePreview.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<RootNamespace>ElectronBot.BraincasePreview</RootNamespace>
<ApplicationIcon>Assets/WindowIcon.ico</ApplicationIcon>
src/ElectronBot.BraincasePreview/Helpers/ElectronBotHelper.cs
+26 -28
View File
@@ -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<EmoticonActionFrameService>();
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<ILogger<ElectronLowLevel>>());
EbConnected = ElectronBot.Connect();
//InvokeClockCanvasStart();
await ConnectDeviceAsync();
}
catch (Exception ex)
src/ElectronBot.BraincasePreview/Package.appxmanifest
+1 -1
View File
@@ -13,7 +13,7 @@
<Identity
Name="37619DC86D31F.44602C779CD56"
Publisher="CN=829B8DD1-2BF4-465F-8663-BB54D1109ED6"
Version="1.5.0.0" />
Version="1.5.1.0" />
<Properties>
<DisplayName>电子脑壳</DisplayName>
src/ElectronBot.BraincasePreview/Services/EmoticonActionFrameService.cs
+1
View File
@@ -27,6 +27,7 @@ public class EmoticonActionFrameService
public void ClearQueue()
{
Interlocked.Exchange(ref _isSending, 0);
_queue.Clear();
}
src/ElectronBot.BraincasePreview/Strings/en-us/Resources.resw
+5 -1
View File
@@ -544,7 +544,11 @@
<value>删除</value>
</data>
<data name="Settings_AboutUpdate.Text" xml:space="preserve">
<value>1.5.0 版本更新说明
<value>1.5.1 版本更新说明
1. 重构代码升级框架到.net7和windows app sdk 1.3。
2. 优化电子连接，可以打开电子脑壳，然后插入电子，热拔插也进行修复，为后期功能打下稳定的基础。
1.5.0 版本更新说明
1. 添加在线表情分享功能，类似于表情商城的功能，可以分享下载表情文件。
2. 调整UI显示，优化弹窗的明暗主题色。
src/ElectronBot.BraincasePreview/Strings/zh-cn/Resources.resw
+5 -1
View File
@@ -547,7 +547,11 @@
<value>删除</value>
</data>
<data name="Settings_AboutUpdate.Text" xml:space="preserve">
<value>1.5.0 版本更新说明
<value>1.5.1 版本更新说明
1. 重构代码升级框架到.net7和windows app sdk 1.3。
2. 优化电子连接，可以打开电子脑壳，然后插入电子，热拔插也进行修复，为后期功能打下稳定的基础。
1.5.0 版本更新说明
1. 添加在线表情分享功能，类似于表情商城的功能，可以分享下载表情文件。
2. 调整UI显示，优化弹窗的明暗主题色。
src/ElectronBot.BraincasePreview/ViewModels/MainViewModel.cs
+13 -1
View File
@@ -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]
src/ElectronBot.DotNet/ElectronBot.DotNet.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<VersionPrefix>1.0.3</VersionPrefix>
src/GestureClassification/GestureClassification.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
src/Verdure.ElectronBot.GrpcService/Verdure.ElectronBot.GrpcService.csproj
+1 -1
View File
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
src/Verdure.NotificationArea/Verdure.NotificationArea.csproj
+1 -1
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<RootNamespace>Verdure.NotificationArea</RootNamespace>
<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>